*.a
*.bck
*.cgi
-*.dylib
*.gz
*.o
-*.so
-*.so.*
*.tokens
.buildrev
autom4te.cache
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
-CHANGES - 2.3b6 - 2018-09-28
+CHANGES - 2.3b6 - 2018-10-29
============================
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
#
# 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.
#
LIBCUPS = @LIBCUPS@
-LIBCUPSCGI = @LIBCUPSCGI@
LIBCUPSIMAGE = @LIBCUPSIMAGE@
-LIBCUPSMIME = @LIBCUPSMIME@
-LIBCUPSPPDC = @LIBCUPSPPDC@
LIBCUPSSTATIC = @LIBCUPSSTATIC@
LIBGSSAPI = @LIBGSSAPI@
LIBMALLOC = @LIBMALLOC@
#
# 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
jobs.cgi \
printers.cgi
LIBTARGETS = \
- libcupscgi.a \
- $(LIBCUPSCGI)
+ libcupscgi.a
UNITTARGETS = \
testcgi \
clean:
$(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset
- $(RM) libcupscgi.so libcupscgi.dylib libcupscgi.a
#
#
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; \
$(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)
#
# 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)" $@
# 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)" $@
# 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)" $@
# 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)" $@
# 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)" $@
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
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"
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)"
else
PICFLAG=0
LIBCUPS="lib$cupsbase.a"
- LIBCUPSCGI="libcupscgi.a"
LIBCUPSIMAGE="libcupsimage.a"
- LIBCUPSMIME="libcupsmime.a"
- LIBCUPSPPDC="libcupsppdc.a"
DSO=":"
DSOXX=":"
fi
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
EXTLINKCUPSIMAGE
EXTLINKCUPS
LIBCUPSSTATIC
-LIBCUPSPPDC
-LIBCUPSMIME
LIBCUPSIMAGE
-LIBCUPSCGI
LIBCUPSBASE
LIBCUPS
DSOFLAGS
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"
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)"
else
PICFLAG=0
LIBCUPS="lib$cupsbase.a"
- LIBCUPSCGI="libcupscgi.a"
LIBCUPSIMAGE="libcupsimage.a"
- LIBCUPSMIME="libcupsmime.a"
- LIBCUPSPPDC="libcupsppdc.a"
DSO=":"
DSOXX=":"
fi
-
-
-
if test x$enable_shared = xno; then
LINKCUPS="../cups/lib$cupsbase.a"
LINKCUPSIMAGE="../cups/libcupsimage.a"
%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
#
# 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.
#
#
ppdpo.o \
testcatalog.o
LIBTARGETS = \
- $(LIBCUPSPPDC) \
libcupsppdc.a
UNITTARGETS = \
ppdc-static \
$(RM) $(TARGETS) $(UNITTARGETS) genstrings
$(RM) -r ppd ppd2
$(RM) sample-import.drv sample.c test.drv
- $(RM) libcupsppdc.so libcupsppdc.dylib
#
#
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 \
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)
#
# 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)" $@
# 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)" $@
# 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) \
# 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)" $@
$(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
#
$(COBJS) \
$(CXXOBJS)
LIBTARGETS = \
- $(LIBCUPSMIME) \
libcupsmime.a
UNITTARGETS = \
clean:
$(RM) $(OBJS)
$(RM) $(TARGETS) $(UNITTARGETS) convert
- $(RM) libcupsmime.so libcupsmime.dylib
#
#
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)
-$(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; \
# 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)
# 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
# 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)" $@
$(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
#
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...
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