From: mike Date: Mon, 18 Jun 2007 22:18:46 +0000 (+0000) Subject: Don't build/install fonts directory on Mac OS X. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b9daaaa31805128eee169bd6fd10d94002a4b7cf;p=thirdparty%2Fcups.git Don't build/install fonts directory on Mac OS X. Add some build system magic to copy all generated executables into a "SYMROOT" directory for inspection after installing. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@6563 7a7537e8-13f0-0310-91df-b6672ffda945 --- diff --git a/Makedefs.in b/Makedefs.in index e55d8466c8..ab262c0de6 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -117,10 +117,12 @@ INSTALLSTATIC = @INSTALLSTATIC@ # for extra debug info) # +ALL_CFLAGS = $(SSLFLAGS) @LARGEFILE@ @PTHREAD_FLAGS@ \ + $(OPTIONS) $(CFLAGS) ARCHFLAGS = @ARCHFLAGS@ ARFLAGS = @ARFLAGS@ BACKLIBS = @BACKLIBS@ -CFLAGS = -I.. $(SSLFLAGS) @CPPFLAGS@ @CFLAGS@ \ +CFLAGS = -I.. @CPPFLAGS@ @CFLAGS@ \ @LARGEFILE@ @PTHREAD_FLAGS@ $(OPTIONS) COMMONLIBS = @LIBS@ CUPSDLIBS = @CUPSDLIBS@ @@ -130,6 +132,7 @@ CXXLIBS = @CXXLIBS@ DSOFLAGS = @DSOFLAGS@ DSOLIBS = @DSOLIBS@ $(COMMONLIBS) DNSSDLIBS = @DNSSDLIBS@ +FONTS = @FONTS@ IMGLIBS = @IMGLIBS@ IMGFILTERS = @IMGFILTERS@ LAUNCHDLIBS = @LAUNCHDLIBS@ @@ -250,15 +253,15 @@ DBUSDIR = @DBUSDIR@ .c.o: echo Compiling $<... - $(CC) $(ARCHFLAGS) $(OPTIM) $(CFLAGS) -c $< + $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c $< .c.32.o: echo Compiling 32-bit $<... - $(CC) $(ARCH32FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $< + $(CC) $(ARCH32FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< .c.64.o: echo Compiling 64-bit $<... - $(CC) $(ARCH64FLAGS) $(OPTIM) $(CFLAGS) -c -o $@ $< + $(CC) $(ARCH64FLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< .cxx.o: echo Compiling $<... diff --git a/Makefile b/Makefile index 06cde6fb62..c34639aef1 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ include Makedefs DIRS = cups backend berkeley cgi-bin filter locale man monitor \ notifier $(PDFTOPS) scheduler systemv test \ $(PHPDIR) \ - conf data doc fonts ppd templates + conf data doc $(FONTS) ppd templates # diff --git a/backend/Makefile b/backend/Makefile index 622d8fb46a..59e102a829 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -71,6 +71,12 @@ install: all done $(RM) $(SERVERBIN)/backend/http $(LN) ipp $(SERVERBIN)/backend/http + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/berkeley/Makefile b/berkeley/Makefile index c6abed8f3b..40dff4877d 100644 --- a/berkeley/Makefile +++ b/berkeley/Makefile @@ -62,6 +62,12 @@ install: all $(INSTALL_BIN) lprm $(BINDIR) $(INSTALL_DIR) -m 755 $(SBINDIR) $(INSTALL_BIN) lpc $(SBINDIR) + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index d7c5709c42..720746946d 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -63,6 +63,12 @@ install: all for file in $(CGIS); do \ $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \ done + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 2b16d23918..712cd32786 100644 --- a/config-scripts/cups-common.m4 +++ b/config-scripts/cups-common.m4 @@ -196,11 +196,14 @@ CUPS_SYSTEM_AUTHKEY="" AC_ARG_ENABLE(dbus, [ --enable-dbus enable DBUS support, default=auto]) +FONTS="fonts" +AC_SUBST(FONTS) LEGACY_BACKENDS="parallel scsi" AC_SUBST(LEGACY_BACKENDS) case $uname in Darwin*) + FONTS="" LEGACY_BACKENDS="" BACKLIBS="-framework IOKit" CUPSDLIBS="-framework IOKit -framework SystemConfiguration" diff --git a/cups/Makefile b/cups/Makefile index f0ba92677c..f42bce6557 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -173,6 +173,12 @@ install: all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64) $(RM) $(LIBDIR)/libcups.dylib; \ $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \ fi + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi installstatic: $(INSTALL_DIR) -m 755 $(LIBDIR) diff --git a/filter/Makefile b/filter/Makefile index c38043eec1..ae4f836b78 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -106,6 +106,12 @@ install: all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64) $(RM) $(LIBDIR)/libcupsimage.dylib; \ $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \ fi + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi installstatic: $(INSTALL_DIR) -m 755 $(LIBDIR) diff --git a/monitor/Makefile b/monitor/Makefile index 16cf2ece7e..f42788104f 100644 --- a/monitor/Makefile +++ b/monitor/Makefile @@ -63,6 +63,12 @@ install: all for file in $(TARGETS); do \ $(INSTALL_BIN) $$file $(SERVERBIN)/monitor; \ done + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/notifier/Makefile b/notifier/Makefile index a3dcfada85..cd98b9dc2a 100644 --- a/notifier/Makefile +++ b/notifier/Makefile @@ -55,6 +55,12 @@ install: all done $(INSTALL_DIR) -m 755 $(CACHEDIR)/rss -chgrp $(CUPS_GROUP) $(CACHEDIR)/rss + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/scheduler/Makefile b/scheduler/Makefile index bd98029404..94d7412543 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -154,6 +154,12 @@ install: all # echo Creating $(CACHEDIR)/ppd... # $(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd # -chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi # diff --git a/systemv/Makefile b/systemv/Makefile index af5ef1af71..99138e64af 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -79,6 +79,12 @@ install: all $(INSTALL_BIN) lpoptions $(BINDIR) $(INSTALL_BIN) lpstat $(BINDIR) $(INSTALL_BIN) -m 4755 -o root lppasswd $(BINDIR) || $(INSTALL_BIN) lppasswd $(BINDIR) + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + for file in $(TARGETS); do \ + cp $$file $(SYMROOT); \ + done \ + fi #