From: glenlow <devnull@localhost>
Date: Fri, 16 May 2008 06:47:23 +0000 (+0000)
Subject: build cleanup: quote commands that may contain spaces, target dot executable instead... 
X-Git-Tag: LAST_LIBGRAPH~32^2~4063
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af9b7b01cf4d1cd354ac8edc27035de6471019cd;p=graphviz

build cleanup: quote commands that may contain spaces, target dot executable instead of gvc library, use external gd library (was missing gdlib-config option)
---

diff --git a/macosx/build/Makefile b/macosx/build/Makefile
index dc58af32a..cf687a40a 100644
--- a/macosx/build/Makefile
+++ b/macosx/build/Makefile
@@ -15,32 +15,32 @@ LOCAL_LIB=$(LOCAL)/lib
 # base
 
 GV_DIR=../..
-GVC=libgvc.la
+DOT=dot
 
 #
 # graphviz
 #
 
-graphviz.pkg: usr/local/lib/$(GVC) Release/Graphviz.app
+graphviz.pkg: usr/local/bin/$(DOT) Release/Graphviz.app
 	@echo
 	@echo PACKAGING GRAPHVIZ...
 	@echo
-	$(PACKAGEMAKER) --doc ../graphviz.pmdoc --out $@
+	"$(PACKAGEMAKER)" --doc ../graphviz.pmdoc --out $@
 
-usr/local/lib/$(GVC): $(GV_DIR)/lib/gvc/$(GVC)
+usr/local/bin/$(DOT): $(GV_DIR)/cmd/dot/.libs/$(DOT)
 	@echo
 	@echo INSTALLING GRAPHVIZ...
 	@echo
 	$(MAKE) DESTDIR=$(CURDIR) -C $(GV_DIR) install-strip && \
 	rm -rf usr/local/lib/graphviz/tcl/libtcldot_builtin.*
 	
-Release/Graphviz.app: $(GV_DIR)/lib/gvc/$(GVC)
+Release/Graphviz.app: ../*.m ../*.h $(GV_DIR)/cmd/dot/.libs/$(DOT)
 	@echo
 	@echo BUILDING GRAPHVIZ GUI...
 	@echo
-	$(XCODEBUILD) -project ../graphviz.xcodeproj -configuration Release
+	"$(XCODEBUILD)" -project ../graphviz.xcodeproj -configuration Release
 
-$(GV_DIR)/lib/gvc/$(GVC): $(GV_DIR)/Makefile
+$(GV_DIR)/cmd/dot/.libs/$(DOT): $(GV_DIR)/Makefile
 	@echo
 	@echo MAKING GRAPHVIZ...
 	@echo
@@ -54,4 +54,4 @@ $(GV_DIR)/Makefile: $(GV_DIR)/configure
 	@echo
 	@echo CONFIGURING GRAPHVIZ...
 	@echo
-	cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" CXXFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs" PKG_CONFIG="$(LOCAL_BIN)/pkg-config" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"
+	cd $(GV_DIR) && ./configure --disable-dependency-tracking --with-ipsepcola --with-quartz CFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" CXXFLAGS="-O2 -arch ppc -arch i386 -arch ppc64 -I$(LOCAL_INCLUDE)" LDFLAGS="-arch ppc -arch i386 -arch ppc64 -L$(LOCAL_LIB) -Wl,-dead_strip -Wl,-dead_strip_dylibs" GDLIB_CONFIG="$(LOCAL_BIN)/gdlib-config" PKG_CONFIG="$(LOCAL_BIN)/pkg-config" PKG_CONFIG_PATH="/usr/X11/lib/pkgconfig"