moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

build: BCC - makefile.b32 tweak

Browse Source 
Get rid of stdout redirection to NUL and move stderr redirection
into RM and RMDIR macros.
This commit is contained in:
Yang Tse 2011-01-13 15:54:14 +01:00
parent 1da65c3d4d
commit fd6b4b3e9b
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/Makefile.b32
View File

@ -7,7 +7,7 @@
# 'BCCDIR' has to be set up to point to the base directory
# of the compiler, i.e. SET BCCDIR = c:\Borland\BCC55
#
# Written by Jaepil Kim, pit@paradise.net.nz
# Initially written by Jaepil Kim, pit@paradise.net.nz
############################################################
!if "$(__MAKE__)" == ""
@ -39,9 +39,9 @@ LIBCURL_IMPLIB = libcurl_imp.lib
PP_CMD = cpp32 -q -P-
CC_CMD = bcc32 -q -c
LD = bcc32
RM = del
RM = del 2>NUL
MKDIR = mkdir
RMDIR = rmdir /s /q
RMDIR = rmdir /s /q 2>NUL
LIB = tlib
IMPLIB = implib
@ -90,32 +90,32 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l
OBJECTS = $(CSOURCES:.c=.obj)
.c.obj:
@-$(RM) $(@R).int >NUL 2>&1
@-$(RM) $(@R).int
$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(<)
$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
all: $(OBJDIR) $(LIBCURL_LIB) $(LIBCURL_DLL)
clean:
@-$(RMDIR) $(OBJDIR) >NUL 2>&1
@-$(RM) $(LIBCURL_LIB) >NUL 2>&1
@-$(RM) $(LIBCURL_IMPLIB) >NUL 2>&1
@-$(RM) libcurl.tds >NUL 2>&1
@-$(RMDIR) $(OBJDIR)
@-$(RM) $(LIBCURL_LIB)
@-$(RM) $(LIBCURL_IMPLIB)
@-$(RM) libcurl.tds
$(OBJDIR):
@-$(RMDIR) $(OBJDIR) >NUL 2>&1
@-$(RMDIR) $(OBJDIR)
@-$(MKDIR) $(OBJDIR)
$(LIBCURL_LIB): $(OBJECTS)
@-$(RM) $(LIBCURL_LIB) >NUL 2>&1
@-$(RM) $(LIBCURL_LIB)
$(LIB) $(LIBFLAGS) $@ @&&!
+$(**: = &^
+)
!
$(LIBCURL_DLL) $(LIBCURL_IMPLIB): $(OBJECTS) $(LINKLIB)
@-$(RM) $(LIBCURL_DLL) >NUL 2>&1
@-$(RM) $(LIBCURL_IMPLIB) >NUL 2>&1
@-$(RM) $(LIBCURL_DLL)
@-$(RM) $(LIBCURL_IMPLIB)
$(LD) $(LDFLAGS) -e$(LIBCURL_DLL) $**
$(IMPLIB) $(LIBCURL_IMPLIB) $(LIBCURL_DLL)

18
src/Makefile.b32
View File

@ -7,7 +7,7 @@
# 'BCCDIR' has to be set up to point to the base directory
# of the compiler, i.e. SET BCCDIR = c:\Borland\BCC55
#
# Written by Jaepil Kim, pit@paradise.net.nz
# Initially written by Jaepil Kim, pit@paradise.net.nz
############################################################
!if "$(__MAKE__)" == ""
@ -37,9 +37,9 @@ PROGNAME = curl.exe
PP_CMD = cpp32 -q -P-
CC_CMD = bcc32 -q -c
LD = bcc32
RM = del
RM = del 2>NUL
MKDIR = mkdir
RMDIR = rmdir /s /q
RMDIR = rmdir /s /q 2>NUL
CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-spa -Dinline=__inline
LDFLAGS = -q -lq -lap
@ -84,23 +84,23 @@ CSOURCES = $(CURL_CFILES) $(CURLX_ONES:/lib/=)
OBJECTS = $(CSOURCES:.c=.obj)
.c.obj:
@-$(RM) $(@R).int >NUL 2>&1
@-$(RM) $(@R).int
$(PP_CMD) $(CC_FLAGS) $(INCDIRS) $(DEFINES) -o$(@R).int $(<)
$(CC_CMD) $(CC_FLAGS) -o$(@) $(@R).int
all: $(OBJDIR) $(PROGNAME)
clean:
@-$(RMDIR) $(OBJDIR) >NUL 2>&1
@-$(RM) $(PROGNAME) >NUL 2>&1
@-$(RM) curl.tds >NUL 2>&1
@-$(RMDIR) $(OBJDIR)
@-$(RM) $(PROGNAME)
@-$(RM) curl.tds
$(OBJDIR):
@-$(RMDIR) $(OBJDIR) >NUL 2>&1
@-$(RMDIR) $(OBJDIR)
@-$(MKDIR) $(OBJDIR)
$(PROGNAME): $(OBJECTS) $(LIBCURL_LIB) $(LINKLIB)
@-$(RM) $(PROGNAME) >NUL 2>&1
@-$(RM) $(PROGNAME)
$(LD) $(LDFLAGS) -e$@ $**