From df389bccfa94dfdedf8483ab75d009635ab4f22c Mon Sep 17 00:00:00 2001 From: "Emden R. Gansner" Date: Mon, 24 Nov 2014 11:23:57 -0500 Subject: [PATCH] Remove explicit builds of tkstubs and tkspline from mac makefiles --- macosx/build/Makefile.leopard | 2 -- macosx/build/Makefile.lion | 2 -- macosx/build/Makefile.mountainlion | 2 -- macosx/build/Makefile.snowleopard | 2 -- macosx/build/Makefile.tiger | 2 -- 5 files changed, 10 deletions(-) diff --git a/macosx/build/Makefile.leopard b/macosx/build/Makefile.leopard index 3d33b7315..dc6332747 100644 --- a/macosx/build/Makefile.leopard +++ b/macosx/build/Makefile.leopard @@ -57,9 +57,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile @echo MAKING GRAPHVIZ... @echo if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi - $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs - $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 -arch ppc -arch i386 -I$(PREFIX)/include" LDFLAGS="-arch ppc -arch i386 -L$(PREFIX)/lib -Wl,-dead_strip" $(MAKE) -C $(GV_DIR) $(GV_DIR)/Makefile: $(GV_DIR)/configure diff --git a/macosx/build/Makefile.lion b/macosx/build/Makefile.lion index 2b3d04df8..e76fbc9b8 100644 --- a/macosx/build/Makefile.lion +++ b/macosx/build/Makefile.lion @@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile @echo MAKING GRAPHVIZ... @echo if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi - $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs - $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip" $(MAKE) -C $(GV_DIR) $(GV_DIR)/Makefile: $(GV_DIR)/configure diff --git a/macosx/build/Makefile.mountainlion b/macosx/build/Makefile.mountainlion index 65a0052ee..7095e1505 100644 --- a/macosx/build/Makefile.mountainlion +++ b/macosx/build/Makefile.mountainlion @@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile @echo MAKING GRAPHVIZ... @echo if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi - $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs - $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip" $(MAKE) -C $(GV_DIR) $(GV_DIR)/Makefile: $(GV_DIR)/configure diff --git a/macosx/build/Makefile.snowleopard b/macosx/build/Makefile.snowleopard index 8e8586a49..2b4122673 100644 --- a/macosx/build/Makefile.snowleopard +++ b/macosx/build/Makefile.snowleopard @@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile @echo MAKING GRAPHVIZ... @echo if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi - $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs - $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCH) -I$(PREFIX)/include" LDFLAGS="$(ARCH) -L$(PREFIX)/lib -Wl,-dead_strip" $(MAKE) -C $(GV_DIR) $(GV_DIR)/Makefile: $(GV_DIR)/configure diff --git a/macosx/build/Makefile.tiger b/macosx/build/Makefile.tiger index 66984ace2..8f73d4b7b 100644 --- a/macosx/build/Makefile.tiger +++ b/macosx/build/Makefile.tiger @@ -62,9 +62,7 @@ $(GV_DIR)/cmd/dot/$(DOT): $(GV_DIR)/Makefile @echo MAKING GRAPHVIZ... @echo if [[ -e $@ ]]; then $(MAKE) -C $(GV_DIR) clean; fi - $(MAKE) -C $(GV_DIR)/tclpkg/tkstubs $(MAKE) -C $(GV_DIR)/tclpkg/tclstubs - $(MAKE) -C $(GV_DIR)/tclpkg/tkspline CFLAGS="-O2 $(ARCHS32) -I$(PREFIX)/include" LDFLAGS="$(ARCHS32) -L$(PREFIX)/lib -Wl,-dead_strip" $(MAKE) -C $(GV_DIR) $(GV_DIR)/Makefile: $(GV_DIR)/configure -- 2.50.1