wsanchez    01/02/09 12:09:23

  Modified:    helpers  rules.mk.in
  Log:
  Separate CFLAGS and CPPFLAGS.
  (Allows overriding CFLAGS without clobbering include paths abnd defines.)
  
  Revision  Changes    Path
  1.4       +5 -4      apr/helpers/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/helpers/rules.mk.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rules.mk.in       2001/01/19 21:48:37     1.3
  +++ rules.mk.in       2001/02/09 20:09:23     1.4
  @@ -67,7 +67,8 @@
   [EMAIL PROTECTED]@
   [EMAIL PROTECTED]@
   
  [EMAIL PROTECTED]@ @OPTIM@ $(INCLUDES)
  [EMAIL PROTECTED]@ @OPTIM@
  [EMAIL PROTECTED]@ $(INCLUDES)
   [EMAIL PROTECTED]@
   [EMAIL PROTECTED]@
   
  @@ -82,7 +83,7 @@
   #
   # Basic macro setup
   #
  -COMPILE      = $(CC) $(CFLAGS)
  +COMPILE      = $(CC) $(CFLAGS) $(CPPFLAGS)
   LT_COMPILE   = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && 
touch $@
   
   LINK         = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
  @@ -138,8 +139,8 @@
   
   local-depend:
        @if test -n "`ls *.c 2> /dev/null`"; then \
  -         echo $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
  -         $(MKDEP) $(INCLUDES) $(CFLAGS) *.c ; \
  +         echo $(MKDEP) $(CFLAGS) $(CPPFLAGS) *.c ; \
  +         $(MKDEP) $(CFLAGS) $(CPPFLAGS) *.c ; \
        fi
   
   # to be filled in by the actual Makefile
  
  
  

Reply via email to