generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some more makefile changes.

Browse Source
This commit is contained in:
Gunter Knauf 2004-06-11 01:04:06 +00:00
parent 281559b31b
commit 5be788ba36
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Makefile.netware
View File

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

26
src/Makefile.netware
View File

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