[Gridflow-cvs] [svn] commit: r6787 - /trunk/Makefile

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed Jul 20 23:52:33 EDT 2011


Author: matju
Date: Wed Jul 20 23:52:33 2011
New Revision: 6787

Log:
rename CFLAGS to GFCFLAGS

Modified:
    trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed Jul 20 23:52:33 2011
@@ -9,7 +9,7 @@
 
 SHELL = /bin/sh
 RM = rm -f
-CFLAGS += -Wall -Wno-unused -Wunused-variable -Wno-trigraphs -g -I.
+GFCFLAGS += -Wall -Wno-unused -Wunused-variable -Wno-trigraphs -g -I.
 
 LDSOFLAGS += -lm $(LIBS)
 OBJS2 = src/gridflow.o src/grid.o src/classes1.o src/classes2.o src/classes3.o src/expr.o src/classes_gui.o \
@@ -23,7 +23,7 @@
 OS = $(shell uname -s | sed -e 's/^MINGW.*/nt/')
 FILT = $(RUBY) -w src/source_filter.rb
 ifeq ($(OS),Darwin)
-  CFLAGS += -mmacosx-version-min=10.4 -fPIC
+  GFCFLAGS += -mmacosx-version-min=10.4 -fPIC
   LDSOFLAGS += -headerpad_max_install_names -bundle -flat_namespace -undefined suppress
   PDSUF = .pd_darwin
   EXECTYPE = macho
@@ -37,16 +37,16 @@
     GEMDEPS += libGem.a
     LDSO_gem_loader += -xnone libGem.a
     
-    #CFLAGS += -DDES_BUGS
+    #GFCFLAGS += -DDES_BUGS
     # -mms-bitfields is necessary because of t_object and the way Miller compiles pd.
-    CFLAGS += -mms-bitfields
+    GFCFLAGS += -mms-bitfields
     EXECTYPE = notdefined # not a real name
   else
     PDSUF = .pd_linux
     LDSOFLAGS = -shared -rdynamic
     EXECTYPE = elf
     ifeq ($(HAVE_GCC64),1)
-      CFLAGS += -fPIC
+      GFCFLAGS += -fPIC
       LDSOFLAGS += -fPIC
       EXECTYPE = elf64
     endif
@@ -66,7 +66,7 @@
 
 .SUFFIXES:
 
-CFLAGS += -DPDSUF=\"$(PDSUF)\"
+GFCFLAGS += -DPDSUF=\"$(PDSUF)\"
 
 #ifeq ($(PLAIN),1)
 #endif
@@ -78,23 +78,23 @@
 %.m.fcs: %.m $(COMMON_DEPS2)
 	$(FILT) $< $@
 %.o: %.cxx.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) -c $< -o $@
 %.1.o: %.cxx.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) -DPASS1 -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) -DPASS1 -c $< -o $@
 %.2.o: %.cxx.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) -DPASS2 -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) -DPASS2 -c $< -o $@
 %.3.o: %.cxx.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) -DPASS3 -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) -DPASS3 -c $< -o $@
 %.4.o: %.cxx.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) -DPASS4 -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) -DPASS4 -c $< -o $@
 %.o: %.m.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) $(SNAFU) -xobjective-c++ -c $< -o $@
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) $(SNAFU) -xobjective-c++ -c $< -o $@
 .PRECIOUS: %.hxx.fcs %.cxx.fcs %.h.fcs %.c.fcs %.m.fcs
 
 # dur de comprenure...
 # found a case where 'make' would pick only the first %.o rule when the 2nd ought to apply.
 src/quartz.o: src/quartz.m.fcs $(COMMON_DEPS2)
-	$(CXX) -xc++ -DLIBGF $(CFLAGS) $(SNAFU) -xobjective-c++ -c src/quartz.m.fcs -o src/quartz.o
+	$(CXX) -xc++ -DLIBGF $(GFCFLAGS) $(SNAFU) -xobjective-c++ -c src/quartz.m.fcs -o src/quartz.o
 
 src/mmx.asm src/mmx_loader.cxx: src/mmx.rb
 	$(RUBY) src/mmx.rb src/mmx.asm src/mmx_loader.cxx
@@ -103,22 +103,22 @@
 
 PDLIB1 = gridflow$(PDSUF)
 $(PDLIB1): $(OBJS2) $(OBJS) $(COMMON_DEPS2)
-	$(CXX) -DPDSUF=\"$(PDSUF)\" $(CFLAGS) -xnone  -o $@ $(OBJS2) $(OBJS) $(LDSOFLAGS) $(LDSO_main)
+	$(CXX) -DPDSUF=\"$(PDSUF)\" $(GFCFLAGS) -xnone  -o $@ $(OBJS2) $(OBJS) $(LDSOFLAGS) $(LDSO_main)
 
 gridflow_gem_loader$(PDSUF): src/gem_loader.cxx.fcs $(COMMON_DEPS2) $(GEMDEPS)
-	$(CXX) $(CFLAGS)                               -o $@ -xc++ src/gem_loader.cxx.fcs $(LDSOFLAGS) $(LDSO_gem_loader)
+	$(CXX) $(GFCFLAGS)                               -o $@ -xc++ src/gem_loader.cxx.fcs $(LDSOFLAGS) $(LDSO_gem_loader)
 gridflow_gem9292$(PDSUF):    src/gem.cxx.fcs        $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS)                               -o $@ -xc++ src/gem.cxx.fcs        $(LDSOFLAGS) $(LDSO_gem_loader)
+	$(CXX) $(GFCFLAGS)                               -o $@ -xc++ src/gem.cxx.fcs        $(LDSOFLAGS) $(LDSO_gem_loader)
 gridflow_gem9293$(PDSUF):    src/gem.cxx.fcs        $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS) -DGEMSTATE93                 -o $@ -xc++ src/gem.cxx.fcs         $(LDSOFLAGS) $(LDSO_gem_loader)
+	$(CXX) $(GFCFLAGS) -DGEMSTATE93                 -o $@ -xc++ src/gem.cxx.fcs         $(LDSOFLAGS) $(LDSO_gem_loader)
 gridflow_gem9393$(PDSUF):    src/gem.cxx.fcs        $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS) -DGEMSTATE93 -DIMAGESTRUCT93 -o $@ -xc++ src/gem.cxx.fcs         $(LDSOFLAGS) $(LDSO_gem_loader)
+	$(CXX) $(GFCFLAGS) -DGEMSTATE93 -DIMAGESTRUCT93 -o $@ -xc++ src/gem.cxx.fcs         $(LDSOFLAGS) $(LDSO_gem_loader)
 gridflow_pdp$(PDSUF):        src/pdp.cxx.fcs        $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS)                              -o $@ -xc++ src/pdp.cxx.fcs         $(LDSOFLAGS) $(LDSO_pdp)
+	$(CXX) $(GFCFLAGS)                              -o $@ -xc++ src/pdp.cxx.fcs         $(LDSOFLAGS) $(LDSO_pdp)
 gridflow_unicorn$(PDSUF):    src/unicorn.cxx.fcs    $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS)                              -o $@ -xc++ src/unicorn.cxx.fcs     $(LDSOFLAGS) $(LDSO_unicorn)
+	$(CXX) $(GFCFLAGS)                              -o $@ -xc++ src/unicorn.cxx.fcs     $(LDSOFLAGS) $(LDSO_unicorn)
 gridflow_x11$(PDSUF):        src/x11.cxx.fcs        $(COMMON_DEPS2)
-	$(CXX) $(CFLAGS)                              -o $@ -xc++ src/x11.cxx.fcs         $(LDSOFLAGS) $(LDSO_x11)
+	$(CXX) $(GFCFLAGS)                              -o $@ -xc++ src/x11.cxx.fcs         $(LDSOFLAGS) $(LDSO_x11)
 
 beep::
 	@for z in 1 2 3 4 5; do echo -ne '\a'; sleep 1; done
@@ -155,4 +155,4 @@
 	dlltool -D /c/Program\ Files/pd/extra/Gem/Gem.dll -d src/Gem.def -l libGem.a
 
 config.make: configure
-       ./configure
+	./configure



More information about the Gridflow-cvs mailing list