diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-05-10 22:58:10 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2010-05-10 22:58:10 +0000 |
| commit | cc75483441ba4241a6b0079e028d7699d99a6b0f (patch) | |
| tree | 07af3321d8e2ad36d8fad169a15674ce7cc4c460 /Makedefs.in | |
| parent | 6d2f911bdd077fee9489b1084b960c4e68fc0658 (diff) | |
| download | cups-cc75483441ba4241a6b0079e028d7699d99a6b0f.tar.gz | |
Merge changes from CUPS 1.5svn-r9136.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2180 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'Makedefs.in')
| -rw-r--r-- | Makedefs.in | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Makedefs.in b/Makedefs.in index 21b587492..781e32062 100644 --- a/Makedefs.in +++ b/Makedefs.in @@ -127,7 +127,6 @@ BANNERTOPS = @BANNERTOPS@ BUILDDIRS = @BUILDDIRS@ CFLAGS = @CPPFLAGS@ @CFLAGS@ COMMONLIBS = @LIBS@ -CUPSDLIBS = @CUPSDLIBS@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ @@ -144,8 +143,6 @@ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ -L../scheduler @LDARCHFLAGS@ \ @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) LEGACY_BACKENDS = @LEGACY_BACKENDS@ -LIBCUPSORDER = @LIBCUPSORDER@ -LIBCUPSIMAGEORDER = @LIBCUPSIMAGEORDER@ LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(DNSSDLIBS) LINKCUPSIMAGE = @LINKCUPSIMAGE@ LIBS = $(LINKCUPS) $(COMMONLIBS) @@ -156,6 +153,7 @@ PAP = @PAP@ PDFTOPS = @PDFTOPS@ PHPDIR = @PHPDIR@ PHPOPTIONS = @PHPOPTIONS@ -I../.. `$(PHPCONFIG) --includes` +SERVERLIBS = @SERVERLIBS@ SSLFLAGS = @SSLFLAGS@ SSLLIBS = @SSLLIBS@ TEXTTOPS = @TEXTTOPS@ |