diff options
| -rw-r--r-- | lib/Makefile.netware | 34 | ||||
| -rw-r--r-- | src/Makefile.netware | 20 |
2 files changed, 40 insertions, 14 deletions
diff --git a/lib/Makefile.netware b/lib/Makefile.netware index ebe44dba0..7a801a82e 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -9,7 +9,7 @@ # Edit the path below to point to the base of your Novell NDK. ifndef NDKBASE -NDKBASE = /novell +NDKBASE = c:/novell endif INSTDIR = ..\curl-$(LIBCURL_VERSION_STR)-bin-nw @@ -34,6 +34,7 @@ endif # must be equal to DEBUG or NDEBUG DB = NDEBUG # DB = DEBUG +# DB = CURLDEBUG # Optimization: -O<n> or debugging: -g ifeq ($(DB),NDEBUG) OPT = -O2 @@ -65,7 +66,9 @@ CFLAGS = $(OPT) -D$(DB) -DNETWARE -nostdinc ifeq ($(CC),mwccnlm) LD = mwldnlm LDFLAGS = -nostdlib $(PRELUDE) $(OBJDIR)/*.o -o $(OBJDIR)/$(TARGET).nlm -commandfile -CFLAGS += -gccinc -inline off -opt nointrinsics -proc 586 +AR = mwldnlm +ARFLAGS = -type library -w nocmdline $(OBJDIR)/*.o -o +CFLAGS += -msgstyle gcc -gccinc -inline off -opt nointrinsics -proc 586 CFLAGS += -relax_pointers #CFLAGS += -w on ifeq ($(LIBARCH),LIBC) @@ -81,6 +84,8 @@ endif else LD = nlmconv LDFLAGS = -T +AR = ar +ARFLAGS = -cq CFLAGS += -fno-builtin -fpack-struct -fpcc-struct-return CFLAGS += -Wall # -pedantic ifeq ($(LIBARCH),LIBC) @@ -122,6 +127,12 @@ endif CFLAGS += $(INCLUDES) ifeq ($(MTSAFE),YES) + XDCOPT = -n +endif +ifeq ($(MTSAFE),NO) + XDCOPT = -u +endif +ifdef XDCOPT XDCDATA = $(OBJDIR)/$(TARGET).xdc endif @@ -182,10 +193,14 @@ OBJS = \ $(OBJDIR)/hostsyn.o \ $(OBJDIR)/hostthre.o \ $(OBJDIR)/inet_ntop.o \ - $(OBJDIR)/nwlib.o +OBJL = $(OBJS) $(OBJDIR)/nwlib.o + +nlm: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm -all: $(OBJDIR) $(OBJDIR)/version.inc $(OBJDIR)/$(TARGET).nlm +lib: $(OBJDIR) $(OBJDIR)/$(TARGET).lib + +all: lib nlm $(OBJDIR)/%.o: %.c # @echo Compiling $< @@ -215,7 +230,12 @@ $(INSTDIR): $(OBJDIR): @mkdir $(OBJDIR) -$(OBJDIR)/$(TARGET).nlm: $(OBJS) $(OBJDIR)/$(TARGET).def $(XDCDATA) +$(OBJDIR)/$(TARGET).lib: $(OBJS) + @echo Creating $@ + @-$(RM) $@ + @$(AR) $(ARFLAGS) $@ $^ + +$(OBJDIR)/$(TARGET).nlm: $(OBJL) $(OBJDIR)/$(TARGET).def $(XDCDATA) @echo Linking $@ @-$(RM) $@ @$(LD) $(LDFLAGS) $(OBJDIR)/$(TARGET).def @@ -262,11 +282,7 @@ ifeq ($(LIBARCH),CLIB) # @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@ @echo $(DL)module clib$(DL) >> $@ else -ifeq ($(LD),nlmconv) @echo $(DL)flag_on 64$(DL) >> $@ -else - @echo $(DL)autounload$(DL) >> $@ -endif @echo $(DL)pseudopreemption$(DL) >> $@ @echo $(DL)start _LibCPrelude$(DL) >> $@ @echo $(DL)exit _LibCPostlude$(DL) >> $@ diff --git a/src/Makefile.netware b/src/Makefile.netware index 1f4923fbd..082d99e39 100644 --- a/src/Makefile.netware +++ b/src/Makefile.netware @@ -9,7 +9,7 @@ # Edit the path below to point to the base of your Novell NDK. ifndef NDKBASE -NDKBASE = /novell +NDKBASE = c:/novell endif INSTDIR = ..\curl-$(LIBCURL_VERSION_STR)-bin-nw @@ -26,6 +26,8 @@ STACK = 64000 SCREEN = $(TARGET) commandline utility MODULES = libcurl.nlm IMPORTS = @../lib/libcurl.imp +# Comment the line below if you dont want to load protected automatically. +LDRING = 3 # Edit the var below to point to your lib architecture. ifndef LIBARCH @@ -125,6 +127,12 @@ endif CFLAGS += $(INCLUDES) ifeq ($(MTSAFE),YES) + XDCOPT = -n +endif +ifeq ($(MTSAFE),NO) + XDCOPT = -u +endif +ifdef XDCOPT XDCDATA = $(OBJDIR)/$(TARGET).xdc endif @@ -205,6 +213,12 @@ endif ifdef XDCDATA @echo $(DL)xdcdata $(XDCDATA)$(DL) >> $@ endif +ifeq ($(LDRING),0) + @echo $(DL)flag_on 16$(DL) >> $@ +endif +ifeq ($(LDRING),3) + @echo $(DL)flag_on 512$(DL) >> $@ +endif ifeq ($(LIBARCH),CLIB) @echo $(DL)start _Prelude$(DL) >> $@ @echo $(DL)exit _Stop$(DL) >> $@ @@ -217,11 +231,7 @@ ifeq ($(LIBARCH),CLIB) # @echo $(DL)import @$(SDK_LDAP)/clib/imports/ldapx.imp$(DL) >> $@ @echo $(DL)module clib$(DL) >> $@ else -ifeq ($(LD),nlmconv) @echo $(DL)flag_on 64$(DL) >> $@ -else - @echo $(DL)autounload$(DL) >> $@ -endif @echo $(DL)pseudopreemption$(DL) >> $@ @echo $(DL)start _LibCPrelude$(DL) >> $@ @echo $(DL)exit _LibCPostlude$(DL) >> $@ |