]> git.ipfire.org Git - thirdparty/cups.git/blobdiff - cups/Makefile
projects / thirdparty / cups.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix compile error.
[thirdparty/cups.git] / cups / Makefile
diff --git a/cups/Makefile b/cups/Makefile
index 94f5e9f10e493cc12c3895a029ac2f576cb83433..da99f02b6dbf099c2d0af18dfb021e6271ead47e 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -15,12 +15,9 @@ include ../Makedefs
 # Object files...
 #
 
-LIBOBJS        =       \
-               adminutil.o \
+COREOBJS       =       \
                array.o \
                auth.o \
-               backchannel.o \
-               backend.o \
                debug.o \
                dest.o \
                dest-job.o \
@@ -29,8 +26,6 @@ LIBOBJS       =       \
                dir.o \
                encode.o \
                file.o \
-               getdevices.o \
-               getifaddrs.o \
                getputfile.o \
                globals.o \
                hash.o \
@@ -48,6 +43,26 @@ LIBOBJS      =       \
                md5passwd.o \
                notify.o \
                options.o \
+               pwg-media.o \
+               raster-error.o \
+               raster-stream.o \
+               raster-stubs.o \
+               request.o \
+               snprintf.o \
+               string.o \
+               tempfile.o \
+               thread.o \
+               tls.o \
+               transcode.o \
+               usersys.o \
+               util.o
+
+DRIVEROBJS     =       \
+               adminutil.o \
+               backchannel.o \
+               backend.o \
+               getdevices.o \
+               getifaddrs.o \
                ppd.o \
                ppd-attr.o \
                ppd-cache.o \
@@ -58,22 +73,18 @@ LIBOBJS     =       \
                ppd-mark.o \
                ppd-page.o \
                ppd-util.o \
-               pwg-media.o \
-               request.o \
+               raster-interpret.o \
+               raster-interstub.o \
                sidechannel.o \
-               snmp.o \
-               snprintf.o \
-               string.o \
-               tempfile.o \
-               thread.o \
-               tls.o \
-               transcode.o \
-               usersys.o \
-               util.o
+               snmp.o
+
+LIBOBJS                = \
+               $(LIBCUPSOBJS)
+
 IMAGEOBJS      = \
-               error.o \
-               interpret.o \
-               raster.o
+               raster-interstub.o \
+               raster-stubs.o
+
 TESTOBJS       = \
                rasterbench.o \
                testadmin.o \
@@ -131,7 +142,6 @@ HEADERSPRIV =       \
                http-private.h \
                ipp-private.h \
                language-private.h \
-               md5-private.h \
                ppd-private.h \
                pwg-private.h \
                raster-private.h \
@@ -268,7 +278,7 @@ install-headers:
 # Install libraries...
 #
 
-install-libs: $(INSTALLSTATIC)
+install-libs: $(LIBTARGETS) $(INSTALLSTATIC)
        echo Installing libraries in $(LIBDIR)...
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
@@ -280,23 +290,25 @@ install-libs: $(INSTALLSTATIC)
                $(RM) $(LIBDIR)/libcups.dylib; \
                $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \
        fi
-       $(INSTALL_DIR) -m 755 $(LIBDIR)
-       $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR)
-       -if test $(LIBCUPSIMAGE) = "libcupsimage.so.2" -o $(LIBCUPSIMAGE) = "libcupsimage.sl.2"; then \
+       -if test "x$(LIBCUPSIMAGE)" != x; then \
+               $(INSTALL_LIB) $(LIBCUPSIMAGE) $(LIBDIR); \
+       fi
+       -if test "x$(LIBCUPSIMAGE)" = "xlibcupsimage.so.2"; then \
                $(RM) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/`basename $(LIBCUPSIMAGE) .2`; \
        fi
-       -if test $(LIBCUPSIMAGE) = "libcupsimage.2.dylib"; then \
+       -if test "x$(LIBCUPSIMAGE)" = "xlibcupsimage.2.dylib"; then \
                $(RM) $(LIBDIR)/libcupsimage.dylib; \
                $(LN) $(LIBCUPSIMAGE) $(LIBDIR)/libcupsimage.dylib; \
        fi
        if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
                $(INSTALL_DIR) $(SYMROOT); \
                cp $(LIBCUPS) $(SYMROOT); \
                dsymutil $(SYMROOT)/$(LIBCUPS); \
-               cp $(LIBCUPSIMAGE) $(SYMROOT); \
-               dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
+               if test "x$(LIBCUPSIMAGE)" != x; then \
+                       cp $(LIBCUPSIMAGE) $(SYMROOT); \
+                       dsymutil $(SYMROOT)/$(LIBCUPSIMAGE); \
+               fi; \
        fi
 
 installstatic:
@@ -315,7 +327,7 @@ installstatic:
 
 uninstall:
        $(RM) $(LIBDIR)/libcups.2.dylib
-       $(RM) $(LIBDIR)/$(LIBCUPSSTATIC)
+       $(RM) $(LIBDIR)/libcups.a
        $(RM) $(LIBDIR)/libcups.dylib
        $(RM) $(LIBDIR)/libcups.so
        $(RM) $(LIBDIR)/libcups.so.2
@@ -329,6 +341,12 @@ uninstall:
                $(RM) $(INCLUDEDIR)/cups/$$file; \
        done
        -$(RMDIR) $(INCLUDEDIR)/cups
+       if test "x$(privateinclude)" != x; then \
+               for file in $(HEADERSPRIV); do \
+                       $(RM) $(PRIVATEINCLUDE)/cups/$$file; \
+               done
+               $(RMDIR) $(PRIVATEINCLUDE)/cups; \
+       fi
 
 
 #
@@ -337,8 +355,8 @@ uninstall:
 
 libcups.so.2:  $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
-               $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
 
@@ -349,12 +367,12 @@ libcups.so.2:     $(LIBOBJS)
 
 libcups.2.dylib:       $(LIBOBJS)
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.14.0 \
                -compatibility_version 2.0.0 \
-               $(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
-               $(COMMONLIBS) $(LIBZ)
+               $(LIBOBJS) \
+               $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
        $(RM) libcups.dylib
        $(LN) $@ libcups.dylib
@@ -366,7 +384,8 @@ libcups.2.dylib:    $(LIBOBJS)
 
 libcups.la:    $(LIBOBJS)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
+               $(LIBOBJS:.o=.lo) \
                -rpath $(LIBDIR) -version-info 2:14 $(LIBGSSAPI) $(SSLLIBS) \
                $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 
@@ -394,7 +413,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
        (nm $(LIBOBJS) $(IMAGEOBJS) 2>/dev/null | grep "T _" | awk '{print $$3}'; \
         echo __cups_strcpy; echo __cups_strlcat; echo __cups_strlcpy) | \
                grep -v -E \
-                   -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel' \
+                   -e 'cups_debug|Apple|BackChannel|Backend|FileCheck|Filter|GSSService|SetNegotiate|SideChannel|SNMP' \
                    -e 'Block$$' | \
                sed -e '1,$$s/^_//' | sort >>libcups2.def
 
@@ -405,7 +424,7 @@ libcups2.def: $(LIBOBJS) $(IMAGEOBJS) Makefile
 
 libcupsimage.so.2:     $(IMAGEOBJS) libcups.so.2
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
+       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
                -L../cups $(LINKCUPS)
        $(RM) `basename $@ .2`
        $(LN) $@ `basename $@ .2`
@@ -417,7 +436,7 @@ libcupsimage.so.2:  $(IMAGEOBJS) libcups.so.2
 
 libcupsimage.2.dylib:  $(IMAGEOBJS) libcups.2.dylib
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ \
+       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \
                -install_name $(libdir)/$@ \
                -current_version 2.3.0 \
                -compatibility_version 2.0.0 \
@@ -433,7 +452,7 @@ libcupsimage.2.dylib:       $(IMAGEOBJS) libcups.2.dylib
 
 libcupsimage.la:       $(IMAGEOBJS) libcups.la
        echo Linking $@...
-       $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
+       $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS:.o=.lo) $(DSOLIBS) \
                -L../cups $(LINKCUPS) \
                -rpath $(LIBDIR) -version-info 2:3
 
@@ -453,9 +472,9 @@ libcupsimage.a:     $(IMAGEOBJS)
 # rasterbench (dependency on static CUPS library is intentional)
 #
 
-rasterbench:   rasterbench.o libcups.a $(LIBCUPSSTATIC)
+rasterbench:   rasterbench.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o libcupsimage.a $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ rasterbench.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -499,10 +518,9 @@ testcache: testcache.o $(LIBCUPSSTATIC)
 # testclient (dependency on static libraries is intentional)
 #
 
-testclient:    testclient.o $(LIBCUPSSTATIC) libcupsimage.a
+testclient:    testclient.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(LDFLAGS) -o $@ testclient.o \
-               libcupsimage.a $(LIBCUPSSTATIC) \
+       $(LD_CC) $(LDFLAGS) -o $@ testclient.o $(LIBCUPSSTATIC) \
                $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -682,9 +700,9 @@ testpwg:    testpwg.o $(LIBCUPSSTATIC) test.ppd
 # testraster (dependency on static CUPS library is intentional)
 #
 
-testraster:    testraster.o $(LIBCUPSSTATIC) libcupsimage.a
+testraster:    testraster.o $(LIBCUPSSTATIC)
        echo Linking $@...
-       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o libcupsimage.a \
+       $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testraster.o \
                $(LIBCUPSSTATIC) $(IMGLIBS) $(DSOLIBS) $(COMMONLIBS) \
                $(SSLLIBS) $(DNSSDLIBS) $(LIBGSSAPI)
        $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
Unnamed repository; edit this file 'description' to name the repository.