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

lib/Makefile.b32: updates

Browse Source 
* Rename the object object directory from 'objs' to 'BCC_obj'. I feel
 it should be named properly. Ref. Makefile.Watcom where it's called
 'WC_Win32.obj'.

* Turn off these warnings to keep the build totally silent (with CBuilder-6
 that is).
  -w-inl    8026 Functions X are not expanded inline.
  -w-pia   8060 Possibly incorrect assignment
  -w-pin  8061 Initialization is only partially bracketed

I'm sure the warnings could be fixed the "proper" way or with some added
"#pragma" statements. But that just clutters the sources IMHO.

* $(MKDIR) and $(RMDIR) have been replaced with the shell-commands 'md'
 and 'rd'. When having MingW/Msys programs 'mkdir.exe' and 'rmdir.exe' in
$PATH, this confuses Borland's make and the result (the cleaning etc.) would
 not be as expected.

* Added a ".path.int = $(OBJDIR)" to tell make where the $(PREPROCESSED)
 files are. Why we need the preprocess step in the fist place is beyond me
(Yang?). But I'll leave that for now.
This commit is contained in:
Gisle Vanem 2011-04-07 15:17:58 +02:00 committed by Daniel Stenberg
parent e9afbe2a65
commit 89fa3b3efb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Makefile.b32
View File

@ -40,17 +40,17 @@ PP_CMD = cpp32 -q -P-
CC_CMD = bcc32 -q -c CC_CMD = bcc32 -q -c
LD = bcc32 LD = bcc32
RM = del 2>NUL RM = del 2>NUL
MKDIR = mkdir MKDIR = md
RMDIR = rmdir /s /q 2>NUL RMDIR = rd /q
LIB = tlib LIB = tlib
IMPLIB = implib IMPLIB = implib
CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-spa -Dinline=__inline CC_FLAGS = -5 -O2 -tWM -w -w-aus -w-ccc -w-dup -w-prc -w-pro -w-rch -w-sig -w-spa -w-inl -w-pia -w-pin -Dinline=__inline
LIBFLAGS = /C /P32 LIBFLAGS = /C /P32
LDFLAGS = -q -lq -laa -tWD LDFLAGS = -q -lq -laa -tWD
SRCDIR = . SRCDIR = .
OBJDIR = .\objs OBJDIR = .\BCC_objs
INCDIRS = -I.;..\include INCDIRS = -I.;..\include
LINKLIB = $(BCCDIR)\lib\cw32mt.lib LINKLIB = $(BCCDIR)\lib\cw32mt.lib
DEFINES = -DNDEBUG -DWIN32 -DBUILDING_LIBCURL DEFINES = -DNDEBUG -DWIN32 -DBUILDING_LIBCURL
@ -83,11 +83,13 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l
.path.c = $(SRCDIR) .path.c = $(SRCDIR)
.path.obj = $(OBJDIR) .path.obj = $(OBJDIR)
.path.int = $(OBJDIR)
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
!include Makefile.inc !include Makefile.inc
OBJECTS = $(CSOURCES:.c=.obj) OBJECTS = $(CSOURCES:.c=.obj)
PREPROCESSED = $(CSOURCES:.c=.int)
.c.obj: .c.obj:
@-$(RM) $(@R).int @-$(RM) $(@R).int
@ -97,6 +99,10 @@ OBJECTS = $(CSOURCES:.c=.obj)
all: $(OBJDIR) $(LIBCURL_LIB) $(LIBCURL_DLL) all: $(OBJDIR) $(LIBCURL_LIB) $(LIBCURL_DLL)
clean: clean:
cd $(OBJDIR)
@-$(RM) $(OBJECTS)
@-$(RM) $(PREPROCESSED)
cd ..
@-$(RMDIR) $(OBJDIR) @-$(RMDIR) $(OBJDIR)
@-$(RM) $(LIBCURL_LIB) @-$(RM) $(LIBCURL_LIB)
@-$(RM) $(LIBCURL_IMPLIB) @-$(RM) $(LIBCURL_IMPLIB)