summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <mpitt@debian.org>2016-08-09 18:11:25 +0200
committerDidier Raboud <odyx@debian.org>2017-08-28 15:00:03 +0200
commitc9afab88dcd225e474d2c40f541c65c088eb6f3d (patch)
tree213c4456fc6b6ab5dfc0371b9ce26130a248eb82
parent72ef5124e4f2245bacde97293140d41355e033ee (diff)
Do not link libcups.so and libcupsimage.so against
unnecessary libraries. This avoids unnecessary package dependencies for both libcups, as well as for packages using cups-config. Bug: https://www.cups.org/str.php?L4343 Bug-Debian: http://bugs.debian.org/438067 Last-Update: 2015-10-02 Patch-Name: drop_unnecessary_dependencies.patch
-rw-r--r--Makedefs.in2
-rw-r--r--cups/Makefile4
-rw-r--r--filter/Makefile2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makedefs.in b/Makedefs.in
index f7d512497..8ec2767fb 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -151,7 +151,7 @@ DBUS_NOTIFIER = @DBUS_NOTIFIER@
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
DNSSD_BACKEND = @DNSSD_BACKEND@
DSOFLAGS = -L../cups @DSOFLAGS@
-DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
+DSOLIBS = @DSOLIBS@
DNSSDLIBS = @DNSSDLIBS@
IPPFIND_BIN = @IPPFIND_BIN@
IPPFIND_MAN = @IPPFIND_MAN@
diff --git a/cups/Makefile b/cups/Makefile
index 660047f40..ae112bd0d 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -313,7 +313,7 @@ uninstall:
libcups.so.2: $(LIBOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBGSSAPI) \
- $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
+ $(SSLLIBS) $(DNSSDLIBS) -lpthread $(LIBZ) -lm
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`
@@ -335,7 +335,7 @@ libcups.2.dylib: $(LIBOBJS) $(LIBCUPSORDER)
-compatibility_version 2.0.0 \
-exported_symbols_list t.exp \
$(LIBOBJS) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
- $(COMMONLIBS) $(LIBZ)
+ -lpthread $(LIBZ) -lm
$(RM) libcups.dylib t.exp
$(LN) $@ libcups.dylib
diff --git a/filter/Makefile b/filter/Makefile
index fc53f85c6..e00cddd6f 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -235,7 +235,7 @@ gziptoany: gziptoany.o ../Makedefs ../cups/$(LIBCUPS)
libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS)
echo Linking $@...
$(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) \
- -L../cups $(LINKCUPS)
+ -L../cups $(LINKCUPS) -lpthread
$(RM) `basename $@ .2`
$(LN) $@ `basename $@ .2`