From: Emden R. Gansner <erg@alum.mit.edu>
Date: Mon, 24 Nov 2014 16:23:57 +0000 (-0500)
Subject: Remove explicit builds of tkstubs and tkspline from mac makefiles
X-Git-Tag: TRAVIS_CI_BUILD_EXPERIMENTAL~139^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df389bccfa94dfdedf8483ab75d009635ab4f22c;p=graphviz

Remove explicit builds of tkstubs and tkspline from mac makefiles
---

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