[gs-cvs] gs/src

[Ralph Giles]

Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv3277/src

Modified Files:
      Tag: GS_7_0X
	macos-fw.mak 
Log Message:
Remove spurious build of the gtk client along with the macos framework.
Backport the 'framework_install' target from HEAD.


Index: macos-fw.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/macos-fw.mak,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- macos-fw.mak	22 Feb 2002 19:45:59 -0000	1.1.2.2
+++ macos-fw.mak	7 Aug 2002 13:05:17 -0000	1.1.2.3
@@ -18,6 +18,7 @@
 
 # Useful make commands:
 #  make framework	make ghostscript as a MacOS X framework
+#  make framework_install install the framework
 #  make so		make ghostscript as a shared object
 #  make sodebug		make debug ghostscript as a shared object
 #  make soinstall	install shared object ghostscript
@@ -40,11 +41,6 @@
 GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
 GSSOC=$(BINDIR)/$(SOBINRELDIR)/$(GSSOC_XENAME)
 
-# loader suporting display device using Gtk+
-GSSOX_XENAME=$(GS)x$(XE)
-GSSOX_XE=$(BINDIR)/$(GSSOX_XENAME)
-GSSOX=$(BINDIR)/$(SOBINRELDIR)/$(GSSOX_XENAME)
-
 # shared library
 #SOPREF=.so
 #SOSUF=
@@ -71,10 +67,8 @@
 	$(RM_) $(GS_SO_MAJOR)
 	ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR)
 
-# Build the small Ghostscript loaders, with Gtk+ and without
-
-$(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
+# Build the small Ghostscript loaders
+# it would be nice if we could link to the framework instead
 
 $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
 	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
@@ -148,7 +142,11 @@
 	cp $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(GS_FRAMEWORK)/Versions/Current/$(FRAMEWORK_NAME)
 	cp -r man $(GS_FRAMEWORK)/Versions/Current
 	cp -r doc $(GS_FRAMEWORK)/Versions/Current
-        
+
+framework_install : framework
+	rm -rf $(prefix)
+	cp -r $(GS_FRAMEWORK) $(prefix)
+
 # Make the build directories
 SODIRS: STDDIRS
 	@if test ! -d $(BINDIR)/$(SOBINRELDIR); then mkdir $(BINDIR)/$(SOBINRELDIR); fi