some more makefile changes.

diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index fa07701577efaea0e37568ddcd75b782ca2f4d5c..a81a62f9ccc603c9798f3a95a83087f2f1de43d9 100644 (file)
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -11,7 +11,7 @@
 ifndef NDKBASE
 NDKBASE        = /novell
 endif
-INSTDIR        = s:/libcurl
+INSTDIR        = ..\curl-$(LIBCURL_VERSION_STR)-bin-nw
 
 # Edit the path below to point to the base of your Zlib sources.
 #ZLIB_PATH = ../../zlib-1.2.1
@@ -43,7 +43,7 @@ else
        OBJDIR  = debug
 endif
 
-# Include the version info retrieved from jk_version.h
+# Include the version info retrieved from curlver.h
 -include $(OBJDIR)/version.inc
 
 # The following line defines your compiler.
@@ -52,8 +52,8 @@ ifdef METROWERKS
 else
        CC = gcc
 endif
+CP     = cp -afv
 # RM   = rm -f
-CP     = cp -fv
 # if you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.de/development/prgtools/mkxdc.zip
@@ -61,23 +61,22 @@ MPKXDC      = mkxdc
 
 # Global flags for all compilers
 CFLAGS = $(OPT) -D$(DB) -DNETWARE -nostdinc
-#CFLAGS        += -DHAVE_LIBZ
 
 ifeq ($(CC),mwccnlm)
 LD     = mwldnlm
 LDFLAGS        = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(OBJDIR)/$(TARGET).nlm -commandfile
-CFLAGS += -gccinc -inline off -opt nointrinsics
+CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
 CFLAGS += -relax_pointers
 #CFLAGS        += -w on
 ifeq ($(LIBARCH),LIBC)
        PRELUDE = $(SDK_LIBC)/imports/libcpre.o
-       CFLAGS += -align 4 -inst mmx -proc 686
+       CFLAGS += -align 4
        CFLAGS += -D_POSIX_SOURCE
 #      CFLAGS += -D__ANSIC__
 else
        PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
 #      CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
-       CFLAGS += -align 1 -proc 586
+       CFLAGS += -align 1
 endif
 else
 LD     = nlmconv
@@ -199,15 +198,20 @@ $(OBJDIR)/version.inc: ../include/curl/curlver.h $(OBJDIR)
 dist: all
        -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
        -$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/version.inc $(XDCDATA)
-#      -$(CP) ../changes.txt $(OBJDIR)/
 
-install: all
-       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)
+install: $(INSTDIR) all
        @$(CP) $(TARGET).nlm $(INSTDIR)
+       @$(CP) ../CHANGES $(INSTDIR)
+       @$(CP) ../COPYING $(INSTDIR)
+       @$(CP) ../README $(INSTDIR)
+       @$(CP) ../RELEASE-NOTES $(INSTDIR)
 
 clean:
        -$(RM) -r $(OBJDIR)
 
+$(INSTDIR):
+       @mkdir $(INSTDIR)
+
 $(OBJDIR):
        @mkdir $(OBJDIR)
 

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 25f7a2900ab0015d53bc8798297428d7ea402490..c7b3e2e080fb1f80ed967fbe5f28d786e34b69fe 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -11,7 +11,7 @@
 ifndef NDKBASE
 NDKBASE        = /novell
 endif
-INSTDIR        = s:/libcurl
+INSTDIR        = ..\curl-$(LIBCURL_VERSION_STR)-bin-nw
 
 # Edit the path below to point to the base of your Zlib sources.
 #ZLIB_PATH = ../../zlib-1.2.1
@@ -44,7 +44,7 @@ else
        OBJDIR  = debug
 endif
 
-# Include the version info retrieved from jk_version.h
+# Include the version info retrieved from curlver.h
 -include $(OBJDIR)/version.inc
 
 # The following line defines your compiler.
@@ -53,8 +53,8 @@ ifdef METROWERKS
 else
        CC = gcc
 endif
+CP     = cp -afv
 # RM   = rm -f
-CP     = cp -fv
 # if you want to mark the target as MTSAFE you will need a tool for
 # generating the xdc data for the linker; here's a minimal tool:
 # http://www.gknw.de/development/prgtools/mkxdc.zip
@@ -63,29 +63,28 @@ MPKXDC      = mkxdc
 # Global flags for all compilers
 CFLAGS = $(OPT) -D$(DB) -DNETWARE -nostdinc
 CFLAGS += -DUSE_MANUAL
-#CFLAGS        += -DHAVE_LIBZ
 
 ifeq ($(CC),mwccnlm)
 LD     = mwldnlm
 LDFLAGS        = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(OBJDIR)/$(TARGET).nlm -commandfile
-CFLAGS += -gccinc -inline off -opt nointrinsics
+CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586
 CFLAGS += -relax_pointers
 #CFLAGS        += -w on
 ifeq ($(LIBARCH),LIBC)
        PRELUDE = $(SDK_LIBC)/imports/libcpre.o
-       CFLAGS += -align 4 -inst mmx -proc 686
+       CFLAGS += -align 4
        CFLAGS += -D_POSIX_SOURCE
 #      CFLAGS += -D__ANSIC__
 else
        PRELUDE = "$(METROWERKS)/Novell Support/libraries/runtime/prelude.obj"
 #      CFLAGS += -include "$(METROWERKS)/Novell Support/headers/nlm_prefix.h"
-       CFLAGS += -align 1 -proc 586
+       CFLAGS += -align 1
 endif
 else
 LD     = nlmconv
 LDFLAGS        = -T
 CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return
-CFLAGS += -Wall #-Wno-main # -pedantic
+CFLAGS += -Wall # -pedantic
 ifeq ($(LIBARCH),LIBC)
        PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
        CFLAGS += -D_POSIX_SOURCE
@@ -148,8 +147,8 @@ vpath %.c ../lib
 all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm 
 
 $(OBJDIR)/%.o: %.c
-       @echo Compiling $<
-       @$(CC) $(CFLAGS) -c $< -o $@
+#      @echo Compiling $<
+       $(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
        @echo Creating $@
@@ -158,15 +157,16 @@ $(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR)
 dist: all
        -$(RM) $(OBJDIR)/*.o $(OBJDIR)/$(TARGET).map $(OBJDIR)/$(TARGET).ncv
        -$(RM) $(OBJDIR)/$(TARGET).def $(OBJDIR)/version.inc $(XDCDATA)
-#      -$(CP) ../changes.txt $(OBJDIR)/
 
-install: all
-       @[ -d $(INSTDIR) ] || mkdir $(INSTDIR)
+install: $(INSTDIR) all
        @$(CP) $(TARGET).nlm $(INSTDIR)
 
 clean:
        -$(RM) -r $(OBJDIR)
 
+$(INSTDIR):
+       @mkdir $(INSTDIR)
+
 $(OBJDIR):
        @mkdir $(OBJDIR)