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 e55d8466c805db82f316ad3311327932ee14a33c..ab262c0de62bf1d6830cd857901d074bc87ef9f4 100644 (file)
--- 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 06cde6fb625bff2de346c1d061e0b25ab5fb9a3f..c34639aef1f2dabf383305b5b02eaefa02440d47 100644 (file)
--- 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 622d8fb46a96ed4f5b6b7fdb2eac3ed28bd3917f..59e102a8295d4058d077bad21554fecdf4dde7eb 100644 (file)
--- 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 c6abed8f3b9fe0933c2912921c8a0a7de98fcf4d..40dff4877d633608c1f616493f42e6b11ce494b4 100644 (file)
--- 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 d7c5709c424ae490a5d60b58ae433a5485163cee..720746946d3b3294a76aaf7a5d9bf1f05a5ecbde 100644 (file)
--- 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 2b16d239180247b2c92a0b1c1d71d75263614a06..712cd32786e54e6a2578b5c0ce8371b9df0bfa24 100644 (file)
--- 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 f0ba92677c11ede32b2ad41edb46323d08b0f057..f42bce6557c9ceef2363c30e7428a69f54541963 100644 (file)
--- 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 c38043eec1b38d2320eca1e01d38718660d89560..ae4f836b782243e094105e0f1bee5a2a3411e556 100644 (file)
--- 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 16cf2ece7e0e87d77ab047ceb7a744628d4d00a6..f42788104fe03fdf28589f8f0b49569d32364918 100644 (file)
--- 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 a3dcfada85f5c825fbe923a51099a54f6300d84b..cd98b9dc2ad02a1439cf98d6b00656f6582e5948 100644 (file)
--- 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 bd98029404c0327340c237fb45856c4a3818cc20..94d741254394f97976c00c26d110a3dd6b563214 100644 (file)
--- 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 af5ef1af7197557256c6a6aba11d140a85ebd8c2..99138e64af888e10fe612bb14f3a528800622154 100644 (file)
--- 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
 
 
 #