From fd6b4b3e9b2e36443f34dcc9055e30d3755f48ba Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 13 Jan 2011 15:54:14 +0100 Subject: build: BCC - makefile.b32 tweak Get rid of stdout redirection to NUL and move stderr redirection into RM and RMDIR macros. --- src/Makefile.b32 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Makefile.b32') diff --git a/src/Makefile.b32 b/src/Makefile.b32 index d2cf49e7e..cc047f49c 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -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$@ $** -- cgit v1.2.3