Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / scheduler / Makefile

diff --git a/scheduler/Makefile b/scheduler/Makefile
index faea0b37dae3183965add1f3e69f378ebb89967c..2921faf7f4dd7c1ab1ea045ad2169a6f3e6fdd04 100644 (file)
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -1,5 +1,5 @@
 #
-# "$Id: Makefile 6801 2007-08-16 18:42:49Z mike $"
+# "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $"
 #
 #   Scheduler Makefile for the Common UNIX Printing System (CUPS).
 #
@@ -46,14 +46,13 @@ LIBOBJS =   \
                type.o
 LIB32OBJS      = $(LIBOBJS:.o=.32.o)
 LIB64OBJS      = $(LIBOBJS:.o=.64.o)
-OBJS   =       \
+COBJS  =       \
                $(CUPSDOBJS) \
                $(LIBOBJS) \
                $(LIB32OBJS) \
                $(LIB64OBJS) \
                cupsfilter.o \
                cups-deviced.o \
-               cups-driverd.o \
                cups-lpd.o \
                cups-polld.o \
                testdirsvc.o \
@@ -62,20 +61,28 @@ OBJS        =       \
                testspeed.o \
                testsub.o \
                util.o
+CXXOBJS        =       \
+               cups-driverd.o
+OBJS   =       \
+               $(COBJS) \
+               $(CXXOBJS)
+LIBTARGETS =   \
+               $(LIBCUPSMIME) \
+               $(LIB32CUPSMIME) \
+               $(LIB64CUPSMIME) \
+               libcupsmime.a \
+               testmime
+
 TARGETS        =       \
+               $(LIBTARGETS) \
                cupsd \
                cupsfilter \
                cups-deviced \
                cups-driverd \
                cups-lpd \
                cups-polld \
-               $(LIBCUPSMIME) \
-               $(LIB32CUPSMIME) \
-               $(LIB64CUPSMIME) \
-               libcupsmime.a \
                testdirsvc \
                testlpd \
-               testmime \
                testspeed \
                testsub
 
@@ -87,6 +94,20 @@ TARGETS      =       \
 all:           $(TARGETS)
 
 
+#
+# Make library targets...
+#
+
+libs:          $(LIBTARGETS)
+
+
+#
+# Make unit tests...
+#
+
+unittests:
+
+
 #
 # Clean all object files...
 #
@@ -103,13 +124,17 @@ clean:
 #
 
 depend:
-       touch Dependencies.tmp
-       makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1
+       touch Dependencies.tmp Dependencies.tmplib
+       makedepend -Y -I.. -fDependencies.tmp $(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.tmp >>Dependencies
-       sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies
-       $(RM) Dependencies.tmp
+       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
 
 
 #
@@ -212,7 +237,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
                $(LN) $(LIBCUPSMIME) $(LIBDIR)/`basename $(LIBCUPSMIME) .1`; \
        fi
        if test $(LIBCUPSMIME) = "libcupsmime.1.dylib"; then \
-               $(STRIP) -x $(LIBDIR)/$(LIBCUPSMIME); \
                $(RM) $(LIBDIR)/libcupsmime.dylib; \
                $(LN) $(LIBCUPSMIME) $(LIBDIR)/libcupsmime.dylib; \
        fi
@@ -316,14 +340,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)
 
 
 #
@@ -350,9 +375,10 @@ cups-deviced:      cups-deviced.o util.o ../cups/$(LIBCUPS)
 # Make the driver daemon, "cups-driverd".
 #
 
-cups-driverd:  cups-driverd.o util.o ../cups/$(LIBCUPS)
+cups-driverd:  cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/$(LIBCUPSPPDC)
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o $(LIBS)
+       $(CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \
+               -L../ppdc -lcupsppdc $(LIBS)
 
 
 #
@@ -481,8 +507,10 @@ testlpd:   testlpd.o ../cups/libcups.a cups-lpd
 
 testmime:      testmime.o libcupsmime.a ../cups/libcups.a
        echo Linking $@...
-       $(CC) $(LDFLAGS) -o $@ testmime.o libcupsmime.a ../cups/libcups.a \
-               $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+       $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testmime.o libcupsmime.a \
+               ../cups/libcups.a $(COMMONLIBS) $(LIBZ) $(SSLLIBS) $(LIBGSSAPI)
+       echo Running MIME tests...
+       ./testmime
 
 
 #
@@ -513,5 +541,5 @@ include Dependencies
 
 
 #
-# End of "$Id: Makefile 6801 2007-08-16 18:42:49Z mike $".
+# End of "$Id: Makefile 7558 2008-05-12 23:46:44Z mike $".
 #