X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fcups.git;a=blobdiff_plain;f=cgi-bin%2FMakefile;h=64b171eaa8368796147ec9260c92cd53943f3eaf;hp=04055777ba9b11d9185c22d09014ac56c9617cb7;hb=5a1d7a17697768b124bdbe8406910972e3c4df3a;hpb=b19ccc9e271691cc71a08e9968c58f464ebeade5 diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index 04055777b..64b171eaa 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -1,16 +1,16 @@ # -# "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $" +# "$Id$" # -# CGI makefile for the Common UNIX Printing System (CUPS). +# CGI makefile for CUPS. # -# Copyright 2007-2008 by Apple Inc. -# Copyright 1997-2006 by Easy Software Products. +# Copyright 2007-2013 by Apple Inc. +# Copyright 1997-2006 by Easy Software Products. # -# These coded instructions, statements, and computer programs are the -# property of Apple Inc. and are protected by Federal copyright -# law. Distribution and use rights are outlined in the file "LICENSE.txt" -# which should have been included with this file. If this file is -# file is missing or damaged, see the license at "http://www.cups.org/". +# These coded instructions, statements, and computer programs are the +# property of Apple Inc. and are protected by Federal copyright +# law. Distribution and use rights are outlined in the file "LICENSE.txt" +# which should have been included with this file. If this file is +# file is missing or damaged, see the license at "http://www.cups.org/". # include ../Makedefs @@ -22,16 +22,13 @@ LIBOBJS = \ search.o \ template.o \ var.o -LIB32OBJS = $(LIBOBJS:.o=.32.o) -LIB64OBJS = $(LIBOBJS:.o=.64.o) OBJS = \ $(LIBOBJS) \ - $(LIB32OBJS) \ - $(LIB64OBJS) \ admin.o \ classes.o \ help.o \ jobs.o \ + makedocset.o \ printers.o \ testcgi.o \ testhi.o \ @@ -46,8 +43,6 @@ CGIS = \ LIBTARGETS = \ libcupscgi.a \ $(LIBCUPSCGI) \ - $(LIB32CUPSCGI) \ - $(LIB32CUPSCGI) \ websearch UNITTARGETS = \ @@ -86,9 +81,8 @@ unittests: $(UNITTARGETS) # clean: - $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) - $(RM) libcupscgi.so libcupscgi.sl libcupscgi.dylib - $(RM) -r 32bit 64bit + $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset + $(RM) libcupscgi.so libcupscgi.dylib # @@ -96,13 +90,7 @@ clean: # depend: - touch Dependencies.tmp - makedepend -Y -I.. -fDependencies.tmp $(OBJS:.o=.c) >/dev/null 2>&1 - $(RM) Dependencies - cp Dependencies.tmp Dependencies - sed -E -e '1,$$s/^([^.]+)\.o:/\1\.32.o: \1\.c /' Dependencies.tmp >>Dependencies - sed -E -e '1,$$s/^([^.]+)\.o:/\1\.64.o: \1\.c /' Dependencies.tmp >>Dependencies - $(RM) Dependencies.tmp + $(CC) -MM $(ALL_CFLAGS) $(OBJS:.o=.c) >Dependencies # @@ -130,8 +118,9 @@ install-exec: done if test "x$(SYMROOT)" != "x"; then \ $(INSTALL_DIR) $(SYMROOT); \ - for file in $(TARGETS); do \ + for file in $(CGIS); do \ cp $$file $(SYMROOT); \ + dsymutil $(SYMROOT)/$$file; \ done \ fi @@ -151,11 +140,11 @@ install-headers: # Install libraries... # -install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64) +install-libs: $(INSTALLSTATIC) echo Installing libraries in $(LIBDIR)... $(INSTALL_DIR) -m 755 $(LIBDIR) $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR) - if test $(LIBCUPSCGI) = "libcupscgi.so.1" -o $(LIBCUPSCGI) = "libcupscgi.sl.1"; then \ + if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \ $(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \ $(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \ fi @@ -166,31 +155,21 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64) if test "x$(SYMROOT)" != "x"; then \ $(INSTALL_DIR) $(SYMROOT); \ cp $(LIBCUPSCGI) $(SYMROOT); \ + dsymutil $(SYMROOT)/$(LIBCUPSCGI); \ fi installstatic: $(INSTALL_DIR) -m 755 $(LIBDIR) - $(INSTALL_LIB) libcupscgi.a $(LIBDIR) + $(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR) $(RANLIB) $(LIBDIR)/libcupscgi.a - -install32bit: - echo Installing libraries in $(LIB32DIR)... - $(INSTALL_DIR) -m 755 $(LIB32DIR) - $(INSTALL_LIB) 32bit/libcupscgi.so.1 $(LIB32DIR)/libcupscgi.so.1 - $(LN) libcupscgi.so.1 $(LIB32DIR)/libcupscgi.so - -install64bit: - echo Installing libraries in $(LIB64DIR)... - $(INSTALL_DIR) -m 755 $(LIB64DIR) - $(INSTALL_LIB) 64bit/libcupscgi.so.1 $(LIB64DIR)/libcupscgi.so.1 - $(LN) libcupscgi.so.1 $(LIB64DIR)/libcupscgi.so + $(CHMOD) 555 $(LIBDIR)/libcupscgi.a # # Uninstall all targets... # -uninstall: $(UNINSTALL32) $(UNINSTALL64) +uninstall: for file in $(CGIS); do \ $(RM) $(SERVERBIN)/cgi-bin/$$file; \ done @@ -198,9 +177,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64) $(RM) $(LIBDIR)/libcupscgi.1.dylib $(RM) $(LIBDIR)/libcupscgi.a $(RM) $(LIBDIR)/libcupscgi.dylib - $(RM) $(LIBDIR)/libcupscgi_s.a - $(RM) $(LIBDIR)/libcupscgi.sl - $(RM) $(LIBDIR)/libcupscgi.sl.1 $(RM) $(LIBDIR)/libcupscgi.so $(RM) $(LIBDIR)/libcupscgi.so.1 -$(RMDIR) $(LIBDIR) @@ -208,16 +184,6 @@ uninstall: $(UNINSTALL32) $(UNINSTALL64) $(RM) $(INCLUDEDIR)/cups/help-index.h -$(RMDIR) $(INCLUDEDIR)/cups -uninstall32bit: - $(RM) $(LIB32DIR)/libcupscgi.so - $(RM) $(LIB32DIR)/libcupscgi.so.1 - -$(RMDIR) $(LIB32DIR) - -uninstall64bit: - $(RM) $(LIB64DIR)/libcupscgi.so - $(RM) $(LIB64DIR)/libcupscgi.so.1 - -$(RMDIR) $(LIB64DIR) - # # Automatic API help files... @@ -229,6 +195,8 @@ apihelp: --css ../doc/cups-printable.css \ --header api-cgi.header --intro api-cgi.shtml \ cgi.h help-index.h $(LIBOBJS:.o=.c) >../doc/help/api-cgi.html + mxmldoc --tokens help/api-cgi.html api-cgi.xml >../doc/help/api-cgi.tokens + $(RM) api-cgi.xml framedhelp: mxmldoc --framed api-cgi \ @@ -240,40 +208,16 @@ framedhelp: # -# libcupscgi.so.1, libcupscgi.sl.1 +# libcupscgi.so.1 # -libcupscgi.so.1 libcupscgi.sl.1: $(LIBOBJS) +libcupscgi.so.1: $(LIBOBJS) echo Linking $@... $(DSO) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS) $(LIBS) $(RM) `basename $@ .1` $(LN) $@ `basename $@ .1` -# -# 32bit/libcupscgi.so.1 -# - -32bit/libcupscgi.so.1: $(LIB32OBJS) - echo Linking 32-bit $@... - -mkdir 32bit - $(DSO) $(ARCH32FLAGS) $(DSO32FLAGS) -o $@ $(LIB32OBJS) $(LIBS) - $(RM) 32bit/libcupscgi.so - $(LN) libcupscgi.so.1 32bit/libcupscgi.so - - -# -# 64bit/libcupscgi.so.1 -# - -64bit/libcupscgi.so.1: $(LIB64OBJS) - echo Linking 64-bit $@... - -mkdir 64bit - $(DSO) $(ARCH64FLAGS) $(DSO64FLAGS) -o $@ $(LIB64OBJS) $(LIBS) - $(RM) 64bit/libcupscgi.so - $(LN) libcupscgi.so.1 64bit/libcupscgi.so - - # # libcupscgi.1.dylib # @@ -290,17 +234,6 @@ libcupscgi.1.dylib: $(LIBOBJS) libcupscgi.exp $(LN) $@ libcupscgi.dylib -# -# libcupscgi_s.a -# - -libcupscgi_s.a: $(LIBOBJS) - echo Creating $@... - $(DSO) $(DSOFLAGS) -o libcupscgi_s.o $(LIBOBJS) $(LIBS) - $(RM) $@ - $(AR) $(ARFLAGS) $@ libcupscgi_s.o - - # # libcupscgi.la # @@ -328,7 +261,7 @@ libcupscgi.a: $(LIBOBJS) admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ admin.o -L. -lcupscgi $(LIBS) + $(CC) $(LDFLAGS) -o $@ admin.o -lcupscgi $(LIBS) # @@ -337,7 +270,7 @@ admin.cgi: admin.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ classes.o -L. -lcupscgi $(LIBS) + $(CC) $(LDFLAGS) -o $@ classes.o -lcupscgi $(LIBS) # @@ -346,7 +279,7 @@ classes.cgi: classes.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ help.o -L. -lcupscgi $(LIBS) + $(CC) $(LDFLAGS) -o $@ help.o -lcupscgi $(LIBS) # @@ -355,7 +288,18 @@ help.cgi: help.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ jobs.o -L. -lcupscgi $(LIBS) + $(CC) $(LDFLAGS) -o $@ jobs.o -lcupscgi $(LIBS) + + +# +# makedocset +# + +makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) + echo Linking $@... + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \ + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ + $(LIBZ) $(LIBGSSAPI) # @@ -371,10 +315,11 @@ printers.cgi: printers.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # testcgi # -testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a +testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testcgi.o libcupscgi.a \ - ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI) + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ + $(LIBZ) $(LIBGSSAPI) echo Testing CGI API... ./testcgi @@ -383,10 +328,11 @@ testcgi: testcgi.o ../Makedefs libcupscgi.a ../cups/libcups.a # testhi # -testhi: testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a +testhi: testhi.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhi.o libcupscgi.a \ - ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI) + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ + $(LIBZ) $(LIBGSSAPI) echo Testing help index API... ./testhi @@ -395,20 +341,21 @@ testhi: testhi.o ../Makedefs libcupscgi.a ../cups/libcups.a # testtemplate # -testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/libcups.a +testtemplate: testtemplate.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/libcups.a \ - $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI) + $(CC) $(LDFLAGS) -o $@ testtemplate.o libcupscgi.a ../cups/$(LIBCUPSSTATIC) \ + $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) $(LIBZ) $(LIBGSSAPI) # # websearch # -websearch: websearch.o ../Makedefs libcupscgi.a ../cups/libcups.a +websearch: websearch.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) echo Linking $@... $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ websearch.o libcupscgi.a \ - ../cups/libcups.a $(COMMONLIBS) $(SSLLIBS) $(LIBZ) $(LIBGSSAPI) + ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ + $(LIBZ) $(LIBGSSAPI) # @@ -419,5 +366,5 @@ include Dependencies # -# End of "$Id: Makefile 7871 2008-08-27 21:12:43Z mike $". +# End of "$Id$". #