]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - scheduler/Makefile
projects / thirdparty / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge changes from CUPS 1.4svn-r8606.
[thirdparty/cups.git] / scheduler / Makefile
diff --git a/scheduler/Makefile b/scheduler/Makefile
index c199e697c4cde924b0f5a3e244df559ba7d7335d..2cbb74edc8d1b4969ec4289b59de0ac79f6f03c9 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,9 +1,9 @@
 #
-# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
+# "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
-#   Copyright 2007-2008 by Apple Inc.
+#   Copyright 2007-2009 by Apple Inc.
 #   Copyright 1997-2007 by Easy Software Products, all rights reserved.
 #
 #   These coded instructions, statements, and computer programs are the
@@ -44,13 +44,9 @@ LIBOBJS =    \
                filter.o \
                mime.o \
                type.o
-LIB32OBJS      = $(LIBOBJS:.o=.32.o)
-LIB64OBJS      = $(LIBOBJS:.o=.64.o)
 COBJS  =       \
                $(CUPSDOBJS) \
                $(LIBOBJS) \
-               $(LIB32OBJS) \
-               $(LIB64OBJS) \
                cupsfilter.o \
                cups-deviced.o \
                cups-lpd.o \
@@ -68,10 +64,14 @@ OBJS        =       \
                $(CXXOBJS)
 LIBTARGETS =   \
                $(LIBCUPSMIME) \
-               $(LIB32CUPSMIME) \
-               $(LIB64CUPSMIME) \
-               libcupsmime.a \
-               testmime
+               libcupsmime.a
+
+UNITTARGETS =  \
+               testdirsvc \
+               testlpd \
+               testmime \
+               testspeed \
+               testsub
 
 TARGETS        =       \
                $(LIBTARGETS) \
@@ -81,10 +81,6 @@ TARGETS      =       \
                cups-driverd \
                cups-lpd \
                cups-polld \
-               testdirsvc \
-               testlpd \
-               testspeed \
-               testsub
 
 
 #
@@ -101,15 +97,21 @@ all:               $(TARGETS)
 libs:          $(LIBTARGETS)
 
 
+#
+# Make unit tests...
+#
+
+unittests:     $(UNITTARGETS)
+
+
 #
 # Clean all object files...
 #
 
 clean:
        $(RM) $(OBJS)
-       $(RM) $(TARGETS) convert
+       $(RM) $(TARGETS) $(UNITTARGETS) convert
        $(RM) libcupsmime.so libcupsmime.sl libcupsmime.dylib
-       $(RM) -r 32bit 64bit
 
 
 #
@@ -117,17 +119,8 @@ clean:
 #
 
 depend:
-       touch Dependencies.tmp Dependencies.tmplib
-       makedepend -Y -I.. -fDependencies.tmp $(COBJS:.o=.c) \
+       makedepend -Y -I.. -fDependencies $(COBJS:.o=.c) \
                $(CXXOBJS:.o=.cxx) >/dev/null 2>&1
-       makedepend -Y -I.. -fDependencies.tmplib $(LIBOBJS:.o=.c) >/dev/null 2>&1
-       $(RM) Dependencies
-       cp Dependencies.tmp Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' \
-               Dependencies.tmplib >>Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' \
-               Dependencies.tmplib >>Dependencies
-       $(RM) Dependencies.tmp Dependencies.tmplib
 
 
 #
@@ -145,38 +138,30 @@ install-data:
        echo Creating $(SERVERBIN)/driver...
        $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
        echo Creating $(SERVERROOT)...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)
        echo Creating $(SERVERROOT)/interfaces...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)/interfaces
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/interfaces
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/interfaces
        echo Creating $(SERVERROOT)/ppd...
-       $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd
-       -chgrp $(CUPS_GROUP) $(SERVERROOT)/ppd
-       -if test "x`uname`" != xDarwin; then \
+       $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd
+       if test "x`uname`" != xDarwin; then \
                echo Creating $(SERVERROOT)/ssl...; \
-               $(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \
-               chgrp $(CUPS_GROUP) $(SERVERROOT)/ssl || true; \
+               $(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \
+       fi
+       if test "$(STATEDIR)" != "$(SERVERROOT)"; then \
                echo Creating $(STATEDIR)...; \
                $(INSTALL_DIR) -m 755 $(STATEDIR); \
-               echo Creating $(STATEDIR)/certs...; \
-               $(INSTALL_DIR) -m 511 $(STATEDIR)/certs; \
-               chgrp $(CUPS_PRIMARY_SYSTEM_GROUP) $(STATEDIR)/certs || true; \
        fi
+       echo Creating $(STATEDIR)/certs...
+       $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \
+               $(STATEDIR)/certs
        echo Creating $(LOGDIR)...
        $(INSTALL_DIR) -m 755 $(LOGDIR)
        echo Creating $(REQUESTS)...
-       $(INSTALL_DIR) -m 710 $(REQUESTS)
-       -chgrp $(CUPS_GROUP) $(REQUESTS)
+       $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS)
        echo Creating $(REQUESTS)/tmp...
-       $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp
-       -chgrp $(CUPS_GROUP) $(REQUESTS)/tmp
+       $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp
        echo Creating $(CACHEDIR)...
-       $(INSTALL_DIR) -m 775 $(CACHEDIR)
-       -chgrp $(CUPS_GROUP) $(CACHEDIR)
-#      echo Creating $(CACHEDIR)/ppd...
-#      $(INSTALL_DIR) -m 755 $(CACHEDIR)/ppd
-#      -chgrp $(CUPS_GROUP) $(CACHEDIR)/ppd
+       $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)
 
 
 #
@@ -186,7 +171,7 @@ install-data:
 install-exec:
        echo Installing programs in $(SBINDIR)...
        $(INSTALL_DIR) -m 755 $(SBINDIR)
-       $(INSTALL_BIN) cupsd $(SBINDIR)
+       $(INSTALL_BIN) -m 500 cupsd $(SBINDIR)
        $(INSTALL_BIN) cupsfilter $(SBINDIR)
        -if test "x`uname`" = xDarwin; then \
                $(INSTALL_DIR) $(BUILDROOT)/System/Library/Printers/Libraries; \
@@ -221,7 +206,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install-libs: $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR)
@@ -243,24 +228,12 @@ installstatic:
        $(INSTALL_LIB) libcupsmime.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcupsmime.a
 
-install32bit:
-       echo Installing libraries in $(LIB32DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB32DIR)
-       $(INSTALL_LIB) 32bit/libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so.1
-       $(LN) libcupsmime.so.1 $(LIB32DIR)/libcupsmime.so
-
-install64bit:
-       echo Installing libraries in $(LIB64DIR)...
-       $(INSTALL_DIR) -m 755 $(LIB64DIR)
-       $(INSTALL_LIB) 64bit/libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so.1
-       $(LN) libcupsmime.so.1 $(LIB64DIR)/libcupsmime.so
-
 
 #
 # Uninstall the scheduler...
 #
 
-uninstall: $(UNINSTALL32) $(UNINSTALL64)
+uninstall:
        $(RM) $(SBINDIR)/cupsd
        $(RM) $(SBINDIR)/cupsfilter
        $(RM) $(SERVERBIN)/daemon/cups-deviced
@@ -293,16 +266,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64)
        $(RM) $(INCLUDEDIR)/cups/mime.h
        -$(RMDIR) $(INCLUDEDIR)/cups
 
-uninstall32bit:
-       $(RM) $(LIB32DIR)/libcupsmime.so
-       $(RM) $(LIB32DIR)/libcupsmime.so.1
-       -$(RMDIR) $(LIB32DIR)
-
-uninstall64bit:
-       $(RM) $(LIB64DIR)/libcupsmime.so
-       $(RM) $(LIB64DIR)/libcupsmime.so.1
-       -$(RMDIR) $(LIB64DIR)
-
 
 #
 # Automatic API help files...
@@ -314,6 +277,8 @@ apihelp:
                --css ../doc/cups-printable.css \
                --header api-mime.header --intro api-mime.shtml \
                mime.h $(LIBOBJS:.o=.c) >../doc/help/api-mime.html
+       mxmldoc --tokens help/api-mime.html api-mime.xml >../doc/help/api-mime.tokens
+       $(RM) api-mime.xml
 
 framedhelp:
        mxmldoc --framed api-mime \
@@ -333,14 +298,15 @@ cupsd:    $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS)
        $(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                $(LIBPAPER) $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBS) \
-               $(LIBGSSAPI)
+               $(LIBGSSAPI) $(LIBWRAP)
 
 cupsd-static:  $(CUPSDOBJS) libcupsmime.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o cupsd-static $(CUPSDOBJS) libcupsmime.a \
                $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
                ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
-               $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
+               $(LIBMALLOC) $(CUPSDLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+               $(LIBWRAP)
 
 
 #
@@ -402,30 +368,6 @@ libcupsmime.so.1 libcupsmime.sl.1: $(LIBOBJS)
        $(LN) $@ `basename $@ .1`
 
 
-#
-# 32bit/libcupsmime.so.1
-#
-
-32bit/libcupsmime.so.1:        $(LIB32OBJS)
-       echo Linking 32-bit $@...
-       -mkdir 32bit
-       $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS)
-       $(RM) 32bit/libcupsmime.so
-       $(LN) libcupsmime.so.1 32bit/libcupsmime.so
-
-
-#
-# 64bit/libcupsmime.so.1
-#
-
-64bit/libcupsmime.so.1:        $(LIB64OBJS)
-       echo Linking 64-bit $@...
-       -mkdir 64bit
-       $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS)
-       $(RM) 64bit/libcupsmime.so
-       $(LN) libcupsmime.so.1 64bit/libcupsmime.so
-
-
 #
 # libcupsmime.1.dylib
 #
@@ -490,7 +432,7 @@ testdirsvc: testdirsvc.o
 testlpd:       testlpd.o ../cups/libcups.a cups-lpd
        echo Linking $@...
        $(CC) $(LDFLAGS) -o testlpd testlpd.o ../cups/libcups.a \
-               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
 
 
 #
@@ -500,7 +442,8 @@ testlpd:    testlpd.o ../cups/libcups.a cups-lpd
 testmime:      testmime.o libcupsmime.a ../cups/libcups.a
        echo Linking $@...
        $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
-               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) \
+               $(DNSSDLIBS) $(LIBGSSAPI)
        echo Running MIME tests...
        ./testmime
 
@@ -512,7 +455,7 @@ testmime:   testmime.o libcupsmime.a ../cups/libcups.a
 testspeed:     testspeed.o ../cups/libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o testspeed testspeed.o ../cups/libcups.a \
-               $(SSLLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -522,7 +465,7 @@ testspeed:  testspeed.o ../cups/libcups.a
 testsub:       testsub.o ../cups/libcups.a
        echo Linking $@...
        $(CC) $(LDFLAGS) -o testsub testsub.o ../cups/libcups.a \
-               $(SSLLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
+               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) $(LIBGSSAPI)
 
 
 #
@@ -533,5 +476,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
+# End of "$Id: Makefile 7875 2008-08-27 22:53:31Z mike $".
 #
Unnamed repository; edit this file 'description' to name the repository.