diff options
| author | Michael R Sweet <michaelrsweet@gmail.com> | 2019-05-17 07:43:00 -0400 |
|---|---|---|
| committer | Michael R Sweet <michaelrsweet@gmail.com> | 2019-05-17 07:43:00 -0400 |
| commit | 7c11d5aea4d9ba596e71e82697bf28b0a00ea5fa (patch) | |
| tree | bed81903be0a10d1839a110318a4ea311433235d | |
| parent | c674bfbe2b057aeb453276f6088e082264f73d0c (diff) | |
| download | cups-7c11d5aea4d9ba596e71e82697bf28b0a00ea5fa.tar.gz | |
Fix Linux build issues with new LINKCUPS macro (Issue #5261)
| -rw-r--r-- | backend/Makefile | 2 | ||||
| -rw-r--r-- | scheduler/Makefile | 2 | ||||
| -rw-r--r-- | systemv/Makefile | 2 | ||||
| -rw-r--r-- | tools/Makefile | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/backend/Makefile b/backend/Makefile index 6f8168c0f..e3ce49be6 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -243,7 +243,7 @@ libbackend.a: $(LIBOBJS) dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(LINKCUPS) + $(LD_CC) $(ALL_LDFLAGS) -o dnssd dnssd.o libbackend.a $(DNSSDLIBS) $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ if test `uname` = Darwin; then \ $(RM) mdns; \ diff --git a/scheduler/Makefile b/scheduler/Makefile index a6be9db00..b50bd0a99 100644 --- a/scheduler/Makefile +++ b/scheduler/Makefile @@ -315,7 +315,7 @@ uninstall: cupsd: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPS) echo Linking $@... $(LD_CC) $(ALL_LDFLAGS) -o cupsd $(CUPSDOBJS) libcupsmime.a \ - $(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) \ + $(PAMLIBS) $(LIBPAPER) $(LIBMALLOC) $(DNSSDLIBS) $(SERVERLIBS) \ $(ONDEMANDLIBS) $(LIBWRAP) $(LIBGSSAPI) $(COMMONLIBS) $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ diff --git a/systemv/Makefile b/systemv/Makefile index b5a0c8fd6..d11dc598c 100644 --- a/systemv/Makefile +++ b/systemv/Makefile @@ -179,7 +179,7 @@ cupsctl: cupsctl.o ../cups/$(LIBCUPS) cupstestppd: cupstestppd.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o $(LINKCUPS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ cupstestppd.o -lm $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ cupstestppd-static: cupstestppd.o ../cups/$(LIBCUPSSTATIC) diff --git a/tools/Makefile b/tools/Makefile index 7d19f5f73..be9cba366 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -147,7 +147,7 @@ local: ippeveprinter-static ipptool-static ippeveprinter: ippeveprinter.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(LINKCUPS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o $(DNSSDLIBS) $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ @@ -187,7 +187,7 @@ ippeveps: ippeveps.o ../cups/$(LIBCUPS) ippfind: ippfind.o ../cups/$(LIBCUPS) echo Linking $@... - $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(LINKCUPS) + $(LD_CC) $(ALL_LDFLAGS) -o $@ ippfind.o $(DNSSDLIBS) $(LINKCUPS) $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ |