about summary refs log tree commit diff
path: root/Makefile.common
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-12-31 08:08:29 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2006-12-31 08:08:29 +0000
commit31fc573df625b06a5f7b8b8e769e9f35cbfdaf91 (patch)
treecaf153af4ea24150e1f54e77c35b9ee51e727055 /Makefile.common
parent2cc04cae07f40a7c58616e4614e88cf0ae8e63c7 (diff)
downloadnetpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.tar.gz
netpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.tar.xz
netpbm-mirror-31fc573df625b06a5f7b8b8e769e9f35cbfdaf91.zip
Release 10.37.0
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@187 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common
index 26b5242f..ed9f2066 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -61,13 +61,13 @@
 #   libjpeg.  All header files from the Netpbm source tree take precedence
 #   over these.
 
-# In addition, there is CADD, which is extra C compilation flags and
+# In addition, there is CADD, which is extra C compilation options and
 # is intended to be set on a make command line (e.g. 'make CADD=-g')
-# for flags that apply just to a particular build.
+# for options that apply just to a particular build.
 
 # In addition, there is CFLAGS_PERSONAL, which is extra C
-# compilation flags and is expected to be set via environment variable
-# for flags that are particular to the person doing the build and not
+# compilation options and is expected to be set via environment variable
+# for options that are particular to the person doing the build and not
 # specific to Netpbm.
 
 include $(SRCDIR)/Makefile.version
@@ -330,7 +330,7 @@ $(PORTBINARIES) $(MATHBINARIES): %: %.o $(NETPBMLIB) $(LIBOPT)
 
 %.o2: %.c importinc
 # Note that the user may have configured -I options into CFLAGS.
-	$(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) \
+	$(CC) -c $(INCLUDES) -DNDEBUG $(CPPFLAGS) $(CFLAGS) \
 	  "-Dmain=main_$*" \
           $(CFLAGS_MERGE) $(CFLAGS_PERSONAL) $(CADD) -o $@ $<