From: Michael R Sweet Date: Mon, 29 Oct 2018 16:12:41 +0000 (-0400) Subject: Don't install cupscgi, cupsmime, or cupsppdc shared libraries. X-Git-Tag: v2.3b6~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=144351068ca29967ae38bb0a1137715bc1b6b910;p=thirdparty%2Fcups.git Don't install cupscgi, cupsmime, or cupsppdc shared libraries. --- diff --git a/.gitignore b/.gitignore index be6eff51c1..c6d949b37c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ *.a *.bck *.cgi -*.dylib *.gz *.o -*.so -*.so.* *.tokens .buildrev autom4te.cache @@ -41,6 +38,14 @@ conf/cupsd.conf conf/mime.convs conf/pam.std conf/snmp.conf +cups/libcups.dylib +cups/libcups.2.dylib +cups/libcups.so +cups/libcups.so.2 +cups/libcupsimage.dylib +cups/libcupsimage.2.dylib +cups/libcupsimage.so +cups/libcupsimage.so.2 cups/locale/ cups/rasterbench cups/test.pwg diff --git a/CHANGES.md b/CHANGES.md index d32d9309d2..ba13c7c091 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3b6 - 2018-09-28 +CHANGES - 2.3b6 - 2018-10-29 ============================ Changes in CUPS v2.3b6 @@ -38,6 +38,8 @@ Changes in CUPS v2.3b6 - Fixed an issue with HTTP Digest authentication (rdar://41709086) - The scheduler could crash when job history was purged (rdar://42198057) - Fixed a memory leak for some IPP (extension) syntaxes. +- The `cupscgi`, `cupsmime`, and `cupsppdc` support libraries are no longer + installed as shared libraries. Changes in CUPS v2.3b5 diff --git a/Makedefs.in b/Makedefs.in index e58889c4e5..8d07dc48bc 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -1,8 +1,8 @@ # # Common makefile definitions for CUPS. # -# Copyright 2007-2018 by Apple Inc. -# Copyright 1997-2007 by Easy Software Products, all rights reserved. +# Copyright © 2007-2018 by Apple Inc. +# Copyright © 1997-2007 by Easy Software Products, all rights reserved. # # Licensed under Apache License v2.0. See the file "LICENSE" for more # information. @@ -92,10 +92,7 @@ LOCALTARGET = @LOCALTARGET@ # LIBCUPS = @LIBCUPS@ -LIBCUPSCGI = @LIBCUPSCGI@ LIBCUPSIMAGE = @LIBCUPSIMAGE@ -LIBCUPSMIME = @LIBCUPSMIME@ -LIBCUPSPPDC = @LIBCUPSPPDC@ LIBCUPSSTATIC = @LIBCUPSSTATIC@ LIBGSSAPI = @LIBGSSAPI@ LIBMALLOC = @LIBMALLOC@ diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 683348b8d7..34fa7dd17e 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,10 +1,11 @@ # # CGI makefile for CUPS. # -# Copyright 2007-2018 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products. +# Copyright © 2007-2018 by Apple Inc. +# Copyright © 1997-2006 by Easy Software Products. # -# Licensed under Apache License v2.0. See the file "LICENSE" for more information. +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # include ../Makedefs @@ -34,8 +35,7 @@ CGIS = \ jobs.cgi \ printers.cgi LIBTARGETS = \ - libcupscgi.a \ - $(LIBCUPSCGI) + libcupscgi.a UNITTARGETS = \ testcgi \ @@ -74,7 +74,6 @@ unittests: $(UNITTARGETS) clean: $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset - $(RM) libcupscgi.so libcupscgi.dylib libcupscgi.a # @@ -104,16 +103,6 @@ install-data: # install-exec: - if test $(LIBCUPSCGI) != libcupscgi.a; then \ - echo Installing libraries in $(LIBDIR)...; \ - $(INSTALL_DIR) -m 755 $(LIBDIR); \ - $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR); \ - fi - if test "x$(SYMROOT)" != "x"; then \ - $(INSTALL_DIR) $(SYMROOT); \ - cp $(LIBCUPSCGI) $(SYMROOT); \ - dsymutil $(SYMROOT)/$(LIBCUPSCGI); \ - fi $(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin for file in $(CGIS); do \ $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \ @@ -150,50 +139,6 @@ uninstall: $(RM) $(SERVERBIN)/cgi-bin/$$file; \ done -$(RMDIR) $(SERVERBIN)/cgi-bin - $(RM) $(LIBDIR)/libcupscgi.1.dylib - $(RM) $(LIBDIR)/libcupscgi.a - $(RM) $(LIBDIR)/libcupscgi.dylib - $(RM) $(LIBDIR)/libcupscgi.so - $(RM) $(LIBDIR)/libcupscgi.so.1 - -$(RMDIR) $(LIBDIR) - - -# -# libcupscgi.so.1 -# - -libcupscgi.so.1: $(LIBOBJS) - echo Linking $@... - $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS) - $(RM) `basename $@ .1` - $(LN) $@ `basename $@ .1` - - -# -# libcupscgi.1.dylib -# - -libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp - echo Linking $@... - $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \ - -install_name $(libdir)/$@ \ - -current_version 1.0.0 \ - -compatibility_version 1.0.0 \ - -exported_symbols_list libcupscgi.exp \ - $(LIBOBJS) $(LIBS) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - $(RM) libcupscgi.dylib - $(LN) $@ libcupscgi.dylib - - -# -# libcupscgi.la -# - -libcupscgi.la: $(LIBOBJS) - echo Linking $@... - $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ - -version-info 1:0 $(LIBS) # @@ -211,9 +156,9 @@ libcupscgi.a: $(LIBOBJS) # admin.cgi # -admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) +admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ admin.o libcupscgi.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -221,9 +166,9 @@ admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # classes.cgi # -classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) +classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ classes.o libcupscgi.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -231,9 +176,9 @@ classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # help.cgi # -help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) +help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ help.o libcupscgi.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -241,9 +186,9 @@ help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # jobs.cgi # -jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) +jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ jobs.o libcupscgi.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -251,9 +196,9 @@ jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # printers.cgi # -printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) +printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) libcupscgi.a echo Linking $@... - $(LD_CC) $(LDFLAGS) -o $@ printers.o -L. -lcupscgi $(LIBS) + $(LD_CC) $(LDFLAGS) -o $@ printers.o libcupscgi.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index e81cdc55cb..690817f0dc 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,10 +1,11 @@ dnl dnl Shared library support for CUPS. dnl -dnl Copyright 2007-2018 by Apple Inc. -dnl Copyright 1997-2005 by Easy Software Products, all rights reserved. +dnl Copyright © 2007-2018 by Apple Inc. +dnl Copyright © 1997-2005 by Easy Software Products, all rights reserved. dnl -dnl Licensed under Apache License v2.0. See the file "LICENSE" for more information. +dnl Licensed under Apache License v2.0. See the file "LICENSE" for more +dnl information. dnl PICFLAG=1 @@ -20,30 +21,21 @@ if test x$enable_shared != xno; then case "$host_os_name" in sunos*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" ;; linux* | gnu* | *bsd*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" ;; darwin*) LIBCUPS="lib$cupsbase.2.dylib" - LIBCUPSCGI="libcupscgi.1.dylib" LIBCUPSIMAGE="libcupsimage.2.dylib" - LIBCUPSMIME="libcupsmime.1.dylib" - LIBCUPSPPDC="libcupsppdc.1.dylib" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc" @@ -52,10 +44,7 @@ if test x$enable_shared != xno; then echo "Warning: shared libraries may not be supported. Trying -shared" echo " option with compiler." LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" @@ -64,10 +53,7 @@ if test x$enable_shared != xno; then else PICFLAG=0 LIBCUPS="lib$cupsbase.a" - LIBCUPSCGI="libcupscgi.a" LIBCUPSIMAGE="libcupsimage.a" - LIBCUPSMIME="libcupsmime.a" - LIBCUPSPPDC="libcupsppdc.a" DSO=":" DSOXX=":" fi @@ -77,10 +63,7 @@ AC_SUBST(DSOXX) AC_SUBST(DSOFLAGS) AC_SUBST(LIBCUPS) AC_SUBST(LIBCUPSBASE) -AC_SUBST(LIBCUPSCGI) AC_SUBST(LIBCUPSIMAGE) -AC_SUBST(LIBCUPSMIME) -AC_SUBST(LIBCUPSPPDC) AC_SUBST(LIBCUPSSTATIC) if test x$enable_shared = xno; then diff --git a/configure b/configure index 27389d3370..0ad647752b 100755 --- a/configure +++ b/configure @@ -688,10 +688,7 @@ LINKCUPS EXTLINKCUPSIMAGE EXTLINKCUPS LIBCUPSSTATIC -LIBCUPSPPDC -LIBCUPSMIME LIBCUPSIMAGE -LIBCUPSCGI LIBCUPSBASE LIBCUPS DSOFLAGS @@ -6599,30 +6596,21 @@ if test x$enable_shared != xno; then case "$host_os_name" in sunos*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)" ;; linux* | gnu* | *bsd*) LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" ;; darwin*) LIBCUPS="lib$cupsbase.2.dylib" - LIBCUPSCGI="libcupscgi.1.dylib" LIBCUPSIMAGE="libcupsimage.2.dylib" - LIBCUPSMIME="libcupsmime.1.dylib" - LIBCUPSPPDC="libcupsppdc.1.dylib" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -dynamiclib -single_module -lc" @@ -6631,10 +6619,7 @@ if test x$enable_shared != xno; then echo "Warning: shared libraries may not be supported. Trying -shared" echo " option with compiler." LIBCUPS="lib$cupsbase.so.2" - LIBCUPSCGI="libcupscgi.so.1" LIBCUPSIMAGE="libcupsimage.so.2" - LIBCUPSMIME="libcupsmime.so.1" - LIBCUPSPPDC="libcupsppdc.so.1" DSO="\$(CC)" DSOXX="\$(CXX)" DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" @@ -6643,10 +6628,7 @@ if test x$enable_shared != xno; then else PICFLAG=0 LIBCUPS="lib$cupsbase.a" - LIBCUPSCGI="libcupscgi.a" LIBCUPSIMAGE="libcupsimage.a" - LIBCUPSMIME="libcupsmime.a" - LIBCUPSPPDC="libcupsppdc.a" DSO=":" DSOXX=":" fi @@ -6659,9 +6641,6 @@ fi - - - if test x$enable_shared = xno; then LINKCUPS="../cups/lib$cupsbase.a" LINKCUPSIMAGE="../cups/libcupsimage.a" diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 1dfeccfd5d..36ac00de0c 100644 --- a/packaging/cups.list.in +++ b/packaging/cups.list.in @@ -357,42 +357,21 @@ l 0755 root sys /usr/bsd/lprm $BINDIR/lprm %system hpux f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2 nostrip() l 0755 root sys $LIBDIR/libcups.sl libcups.sl.2 -f 0555 root sys $LIBDIR/libcupscgi.sl.1 cgi-bin/libcupscgi.sl.1 nostrip() -l 0755 root sys $LIBDIR/libcupscgi.sl libcupscgi.sl.1 f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2 nostrip() l 0755 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2 -f 0555 root sys $LIBDIR/libcupsmime.sl.1 scheduler/libcupsmime.sl.1 nostrip() -l 0755 root sys $LIBDIR/libcupsmime.sl libcupsmime.sl.1 -f 0555 root sys $LIBDIR/libcupsppdc.sl.1 ppdc/libcupsppdc.sl.1 nostrip() -l 0755 root sys $LIBDIR/libcupsppdc.sl libcupsppdc.sl.1 %system aix f 0555 root sys $LIBDIR/libcups_s.a cups/libcups_s.a nostrip() -f 0555 root sys $LIBDIR/libcupscgi_s.a cgi-bin/libcupscgi_s.a nostrip() f 0555 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a nostrip() -f 0555 root sys $LIBDIR/libcupsmime_s.a scheduler/libcupsmime_s.a nostrip() -f 0555 root sys $LIBDIR/libcupsppdc_s.a ppdc/libcupsppdc_s.a nostrip() %system darwin f 0555 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib nostrip() l 0755 root sys $LIBDIR/libcups.dylib libcups.2.dylib -f 0555 root sys $LIBDIR/libcupscgi.1.dylib cgi-bin/libcupscgi.1.dylib nostrip() -l 0755 root sys $LIBDIR/libcupscgi.dylib libcupscgi.1.dylib f 0555 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib nostrip() l 0755 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib -f 0555 root sys $LIBDIR/libcupsmime.1.dylib scheduler/libcupsmime.1.dylib nostrip() -l 0755 root sys $LIBDIR/libcupsmime.dylib libcupsmime.1.dylib -f 0555 root sys $LIBDIR/libcupsppdc.1.dylib ppdc/libcupsppdc.1.dylib nostrip() -l 0755 root sys $LIBDIR/libcupsppdc.dylib libcupsppdc.1.dylib %system !hpux !aix !darwin f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2 nostrip() l 0755 root sys $LIBDIR/libcups.so libcups.so.2 -f 0555 root sys $LIBDIR/libcupscgi.so.1 cgi-bin/libcupscgi.so.1 nostrip() -l 0755 root sys $LIBDIR/libcupscgi.so libcupscgi.so.1 f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2 nostrip() l 0755 root sys $LIBDIR/libcupsimage.so libcupsimage.so.2 -f 0555 root sys $LIBDIR/libcupsmime.so.1 scheduler/libcupsmime.so.1 nostrip() -l 0755 root sys $LIBDIR/libcupsmime.so libcupsmime.so.1 -f 0555 root sys $LIBDIR/libcupsppdc.so.1 ppdc/libcupsppdc.so.1 nostrip() -l 0755 root sys $LIBDIR/libcupsppdc.so libcupsppdc.so.1 %system all %subpackage %endif diff --git a/ppdc/Makefile b/ppdc/Makefile index 834052248b..d8db3eb008 100644 --- a/ppdc/Makefile +++ b/ppdc/Makefile @@ -1,10 +1,11 @@ # # Makefile for the CUPS PPD Compiler. # -# Copyright 2007-2018 by Apple Inc. -# Copyright 2002-2006 by Easy Software Products. +# Copyright © 2007-2018 by Apple Inc. +# Copyright © 2002-2006 by Easy Software Products. # -# Licensed under Apache License v2.0. See the file "LICENSE" for more information. +# Licensed under Apache License v2.0. See the file "LICENSE" for more +# information. # # @@ -48,7 +49,6 @@ OBJS = \ ppdpo.o \ testcatalog.o LIBTARGETS = \ - $(LIBCUPSPPDC) \ libcupsppdc.a UNITTARGETS = \ ppdc-static \ @@ -98,7 +98,6 @@ clean: $(RM) $(TARGETS) $(UNITTARGETS) genstrings $(RM) -r ppd ppd2 $(RM) sample-import.drv sample.c test.drv - $(RM) libcupsppdc.so libcupsppdc.dylib # @@ -130,16 +129,6 @@ install-data: # install-exec: - if test $(LIBCUPSPPDC) != libcupsppdc.a; then \ - echo Installing libraries in $(LIBDIR)...; \ - $(INSTALL_DIR) -m 755 $(LIBDIR); \ - $(INSTALL_LIB) $(LIBCUPSPPDC) $(LIBDIR); \ - fi - if test "x$(SYMROOT)" != "x"; then \ - $(INSTALL_DIR) $(SYMROOT); \ - cp $(LIBCUPSPPDC) $(SYMROOT); \ - dsymutil $(SYMROOT)/$(LIBCUPSPPDC); \ - fi echo Installing PPD compiler programs... $(INSTALL_DIR) $(BINDIR) for file in $(EXECTARGETS); do \ @@ -178,12 +167,6 @@ uninstall: done $(RM) $(DATADIR)/drv/sample.drv $(RMDIR) $(DATADIR)/drv - $(RM) $(LIBDIR)/libcupsppdc.1.dylib - $(RM) $(LIBDIR)/libcupsppdc.a - $(RM) $(LIBDIR)/libcupsppdc.dylib - $(RM) $(LIBDIR)/libcupsppdc.so - $(RM) $(LIBDIR)/libcupsppdc.so.1 - -$(RMDIR) $(LIBDIR) # @@ -212,9 +195,9 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ # ppdc, the PPD compiler. # -ppdc: ppdc.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) +ppdc: ppdc.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o -L. -lcupsppdc $(LIBS) + $(LD_CXX) $(LDFLAGS) -o $@ ppdc.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -233,9 +216,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) foo.drv foo-fr.po # ppdhtml, the PPD to HTML utility. # -ppdhtml: ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) +ppdhtml: ppdhtml.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o -L. -lcupsppdc $(LIBS) + $(LD_CXX) $(LDFLAGS) -o $@ ppdhtml.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -243,13 +226,13 @@ ppdhtml: ppdhtml.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) # ppdi, import PPD files. # -ppdi: ppdi.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) +ppdi: ppdi.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o -L. -lcupsppdc $(LIBS) + $(LD_CXX) $(LDFLAGS) -o $@ ppdi.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) +ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(LD_CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \ ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ @@ -282,9 +265,9 @@ ppdmerge: ppdmerge.o ../cups/$(LIBCUPS) # ppdpo, create message catalog files. # -ppdpo: ppdpo.o $(LIBCUPSPPDC) ../cups/$(LIBCUPS) +ppdpo: ppdpo.o libcupsppdc.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o -L. -lcupsppdc $(LIBS) + $(LD_CXX) $(LDFLAGS) -o $@ ppdpo.o libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -300,46 +283,6 @@ testcatalog: testcatalog.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -# -# libcupsppdc.so.1 -# - -libcupsppdc.so.1: $(LIBOBJS) ../cups/$(LIBCUPS) - echo Linking $@... - $(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LINKCUPS) - $(RM) `basename $@ .1` - $(LN) $@ `basename $@ .1` - - -# -# libcupsppdc.1.dylib -# - -libcupsppdc.1.dylib: $(LIBOBJS) ../cups/$(LIBCUPS) - echo Creating export list for $@... - nm -gm $(LIBOBJS) | grep "__text" | grep -v weak | awk '{print $$NF}' | sort >t.exp - echo Linking $@... - $(DSOXX) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \ - -install_name $(libdir)/$@ \ - -current_version 1.0.0 \ - -compatibility_version 1.0.0 \ - -exported_symbols_list t.exp \ - $(LIBOBJS) $(LINKCUPS) $(COMMONLIBS) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - $(RM) libcupsppdc.dylib t.exp - $(LN) $@ libcupsppdc.dylib - - -# -# libcupsppdc.la -# - -libcupsppdc.la: $(LIBOBJS) ../cups/$(LIBCUPS) - echo Linking $@... - $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ - -version-info 1:0 $(LINKCUPS) - - # # libcupsppdc.a # diff --git a/scheduler/Makefile b/scheduler/Makefile index 5b82ebcbe6..2214c67631 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -58,7 +58,6 @@ OBJS = \ $(COBJS) \ $(CXXOBJS) LIBTARGETS = \ - $(LIBCUPSMIME) \ libcupsmime.a UNITTARGETS = \ @@ -108,7 +107,6 @@ unittests: $(UNITTARGETS) clean: $(RM) $(OBJS) $(RM) $(TARGETS) $(UNITTARGETS) convert - $(RM) libcupsmime.so libcupsmime.dylib # @@ -213,16 +211,6 @@ install-data: # install-exec: - if test $(LIBCUPSMIME) != libcupsmime.a; then \ - echo Installing libraries in $(LIBDIR)...; \ - $(INSTALL_DIR) -m 755 $(LIBDIR); \ - $(INSTALL_LIB) $(LIBCUPSMIME) $(LIBDIR); \ - fi - if test "x$(SYMROOT)" != "x"; then \ - $(INSTALL_DIR) $(SYMROOT); \ - cp $(LIBCUPSMIME) $(SYMROOT); \ - dsymutil $(SYMROOT)/$(LIBCUPSMIME); \ - fi echo Installing programs in $(SBINDIR)... $(INSTALL_DIR) -m 755 $(SBINDIR) $(INSTALL_BIN) -m $(CUPS_CUPSD_FILE_PERM) cupsd $(SBINDIR) @@ -281,12 +269,6 @@ uninstall: -$(RMDIR) $(REQUESTS) -$(RMDIR) $(LOGDIR) -$(RMDIR) $(CACHEDIR) - $(RM) $(LIBDIR)/libcupsmime.1.dylib - $(RM) $(LIBDIR)/libcupsmime.a - $(RM) $(LIBDIR)/libcupsmime.dylib - $(RM) $(LIBDIR)/libcupsmime.so - $(RM) $(LIBDIR)/libcupsmime.so.1 - -$(RMDIR) $(LIBDIR) if test "x$(INITDIR)" != x; then \ echo Uninstalling init scripts...; \ $(RM) $(BUILDROOT)$(INITDIR)/init.d/cups; \ @@ -330,9 +312,9 @@ uninstall: # Make the scheduler executable, "cupsd". # -cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cups/$(LIBCUPS) +cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \ + $(LD_CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \ $(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \ $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(ONDEMANDLIBS) \ $(DNSSDLIBS) $(LIBS) $(LIBGSSAPI) $(LIBWRAP) @@ -352,9 +334,9 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC) # Make the cupsfilter utility. # -cupsfilter: cupsfilter.o $(LIBCUPSMIME) ../cups/$(LIBCUPS) +cupsfilter: cupsfilter.o libcupsmime.a ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o -L. -lcupsmime $(LIBS) + $(LD_CC) $(LDFLAGS) -o cupsfilter cupsfilter.o libcupsmime.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ $(RM) convert $(LN) cupsfilter convert @@ -381,10 +363,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) ../ppdc/$(LIBCUPSPPDC) +cups-driverd: cups-driverd.o util.o ../cups/$(LIBCUPS) ../ppdc/libcupsppdc.a echo Linking $@... $(LD_CXX) $(LDFLAGS) -o cups-driverd cups-driverd.o util.o \ - -L../ppdc -lcupsppdc $(LIBS) + ../ppdc/libcupsppdc.a $(LIBS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -408,44 +390,6 @@ cups-lpd: cups-lpd.o ../cups/$(LIBCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ -# -# libcupsmime.so.1 -# - -libcupsmime.so.1: $(LIBOBJS) - echo Linking $@... - $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS) - $(RM) `basename $@ .1` - $(LN) $@ `basename $@ .1` - - -# -# libcupsmime.1.dylib -# - -libcupsmime.1.dylib: $(LIBOBJS) libcupsmime.exp - echo Linking $@... - $(DSO) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ \ - -install_name $(libdir)/$@ \ - -current_version 1.0.0 \ - -compatibility_version 1.0.0 \ - -exported_symbols_list libcupsmime.exp \ - $(LIBOBJS) $(LIBS) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - $(RM) libcupsmime.dylib - $(LN) $@ libcupsmime.dylib - - -# -# libcupsmime.la -# - -libcupsmime.la: $(LIBOBJS) - echo Linking $@... - $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ - -version-info 1:0 $(LIBS) - - # # libcupsmime.a # diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh index 74157129cf..ac5ea76c44 100755 --- a/test/run-stp-tests.sh +++ b/test/run-stp-tests.sh @@ -570,34 +570,28 @@ fi echo "Setting up environment variables for test..." if test "x$LD_LIBRARY_PATH" = x; then - LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc" + LD_LIBRARY_PATH="$root/cups" else - LD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$LD_LIBRARY_PATH" + LD_LIBRARY_PATH="$root/cups:$LD_LIBRARY_PATH" fi -LD_PRELOAD="$root/cups/libcups.so.2:$root/cups/libcupsimage.so.2:$root/cgi-bin/libcupscgi.so.1:$root/scheduler/libcupsmime.so.1:$root/ppdc/libcupsppdc.so.1" +LD_PRELOAD="$root/cups/libcups.so.2:$root/cups/libcupsimage.so.2" if test `uname` = SunOS -a -r /usr/lib/libCrun.so.1; then LD_PRELOAD="/usr/lib/libCrun.so.1:$LD_PRELOAD" fi if test -f $root/cups/libcups.2.dylib; then if test "x$DYLD_INSERT_LIBRARIES" = x; then - DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib:$root/cgi-bin/libcupscgi.1.dylib:$root/scheduler/libcupsmime.1.dylib:$root/ppdc/libcupsppdc.1.dylib" + DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib" else - DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib:$root/cgi-bin/libcupscgi.1.dylib:$root/scheduler/libcupsmime.1.dylib:$root/ppdc/libcupsppdc.1.dylib:$DYLD_INSERT_LIBRARIES" + DYLD_INSERT_LIBRARIES="$root/cups/libcups.2.dylib:$root/cups/libcupsimage.2.dylib:$DYLD_INSERT_LIBRARIES" fi fi if test "x$DYLD_LIBRARY_PATH" = x; then - DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc" + DYLD_LIBRARY_PATH="$root/cups" else - DYLD_LIBRARY_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$DYLD_LIBRARY_PATH" -fi - -if test "x$SHLIB_PATH" = x; then - SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc" -else - SHLIB_PATH="$root/cups:$root/filter:$root/cgi-bin:$root/scheduler:$root/ppdc:$SHLIB_PATH" + DYLD_LIBRARY_PATH="$root/cups:$DYLD_LIBRARY_PATH" fi # These get exported because they don't have side-effects... @@ -627,7 +621,6 @@ echo "DYLD_LIBRARY_PATH=\"$DYLD_LIBRARY_PATH\"; export DYLD_LIBRARY_PATH" >>$run echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"; export LD_LIBRARY_PATH" >>$runcups echo "LD_PRELOAD=\"$LD_PRELOAD\"; export LD_PRELOAD" >>$runcups echo "LOCALEDIR=\"$LOCALEDIR\"; export LOCALEDIR" >>$runcups -echo "SHLIB_PATH=\"$SHLIB_PATH\"; export SHLIB_PATH" >>$runcups if test "x$CUPS_DEBUG_LEVEL" != x; then echo "CUPS_DEBUG_FILTER='$CUPS_DEBUG_FILTER'; export CUPS_DEBUG_FILTER" >>$runcups echo "CUPS_DEBUG_LEVEL=$CUPS_DEBUG_LEVEL; export CUPS_DEBUG_LEVEL" >>$runcups