X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=cups%2FMakefile;h=48e6cedfa1011acb1a90d248cc81a7486a0441ea;hb=c9fc04c6ec14cb5073b49491ab90551183743b4d;hp=2c8bdbdb96b1420e37dcf31675396d4561a5169d;hpb=50fe720154d2af59cdeeaecf05cc868530e16248;p=thirdparty%2Fcups.git diff --git a/cups/Makefile b/cups/Makefile index 2c8bdbdb9..48e6cedfa 100644 --- a/cups/Makefile +++ b/cups/Makefile @@ -29,11 +29,13 @@ LIBOBJS = \ backchannel.o \ backend.o \ custom.o \ + debug.o \ dest.o \ dir.o \ emit.o \ encode.o \ file.o \ + getdevices.o \ getifaddrs.o \ getputfile.o \ globals.o \ @@ -98,7 +100,6 @@ HEADERS = \ ppd.h \ raster.h \ sidechannel.h \ - snmp.h \ transcode.h \ versioning.h @@ -107,20 +108,23 @@ HEADERS = \ # Targets in this directory... # -TARGETS = \ +LIBTARGETS = \ $(LIBCUPS) \ $(LIB32CUPS) \ $(LIB64CUPS) \ libcups.a \ - testadmin \ testarray \ - testcups \ testfile \ testhttp \ testi18n \ testipp \ testlang \ - testppd \ + testppd + +TARGETS = \ + $(LIBTARGETS) \ + testadmin \ + testcups \ testsnmp @@ -131,6 +135,13 @@ TARGETS = \ all: $(TARGETS) +# +# Make library targets... +# + +libs: $(LIBTARGETS) + + # # Remove object and target files... # @@ -201,7 +212,6 @@ install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64) $(LN) $(LIBCUPS) $(LIBDIR)/`basename $(LIBCUPS) .2`; \ fi if test $(LIBCUPS) = "libcups.2.dylib"; then \ - $(STRIP) -x $(LIBDIR)/$(LIBCUPS); \ $(RM) $(LIBDIR)/libcups.dylib; \ $(LN) $(LIBCUPS) $(LIBDIR)/libcups.dylib; \ fi @@ -382,8 +392,10 @@ testadmin: testadmin.o libcups.a testarray: testarray.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testarray.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testarray.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running array API tests... + ./testarray # @@ -402,8 +414,10 @@ testcups: testcups.o libcups.a testfile: testfile.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testfile.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testfile.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running file API tests... + ./testfile # @@ -412,8 +426,10 @@ testfile: testfile.o libcups.a testhttp: testhttp.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testhttp.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running HTTP API tests... + ./testhttp # @@ -422,8 +438,10 @@ testhttp: testhttp.o libcups.a testipp: testipp.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testipp.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testipp.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running IPP API tests... + ./testipp # @@ -432,8 +450,10 @@ testipp: testipp.o libcups.a testi18n: testi18n.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testi18n.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testi18n.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running internationalization API tests... + ./testi18n # @@ -442,8 +462,10 @@ testi18n: testi18n.o libcups.a testlang: testlang.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testlang.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testlang.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running language API tests... + ./testlang # @@ -452,8 +474,10 @@ testlang: testlang.o libcups.a testppd: testppd.o libcups.a echo Linking $@... - $(CC) $(LDFLAGS) -o $@ testppd.o libcups.a \ + $(CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ testppd.o libcups.a \ $(LIBGSSAPI) $(SSLLIBS) $(COMMONLIBS) $(LIBZ) + echo Running PPD API tests... + ./testppd # @@ -484,7 +508,7 @@ apihelp: mxmldoc --section "Programming" --title "CUPS API" \ --css ../doc/cups-printable.css \ --header api-cups.header --intro api-cups.shtml \ - cups.h dest.c getputfile.c language.c notify.c \ + cups.h dest.c language.c notify.c \ options.c tempfile.c usersys.c \ util.c >../doc/help/api-cups.html mxmldoc --section "Programming" --title "File and Directory APIs" \ @@ -499,15 +523,15 @@ apihelp: mxmldoc --section "Programming" --title "HTTP and IPP APIs" \ --css ../doc/cups-printable.css \ --header api-httpipp.header --intro api-httpipp.shtml \ - http.h ipp.h auth.c encode.c http.c http-addr.c \ - http-support.c ipp.c ipp-support.c md5passwd.c \ - request.c >../doc/help/api-httpipp.html + http.h ipp.h auth.c getdevices.c getputfile.c encode.c \ + http.c http-addr.c http-support.c ipp.c ipp-support.c \ + md5passwd.c request.c >../doc/help/api-httpipp.html mxmldoc --section "Programming" \ --title "Filter and Backend Programming" \ --css ../doc/cups-printable.css \ --header api-filter.header --intro api-filter.shtml \ backchannel.c backend.h backend.c sidechannel.c sidechannel.h \ - snmp.c snmp.h >../doc/help/api-filter.html + >../doc/help/api-filter.html framedhelp: echo Generating CUPS API help files... @@ -525,7 +549,7 @@ framedhelp: --section "Programming" --title "CUPS API" \ --css ../doc/cups-printable.css \ --header api-cups.header --intro api-cups.shtml \ - cups.h dest.c getputfile.c language.c notify.c \ + cups.h dest.c language.c notify.c \ options.c tempfile.c usersys.c \ util.c mxmldoc --framed api-filedir \ @@ -543,16 +567,15 @@ framedhelp: --section "Programming" --title "HTTP and IPP APIs" \ --css ../doc/cups-printable.css \ --header api-httpipp.header --intro api-httpipp.shtml \ - http.h ipp.h auth.c encode.c http.c http-addr.c \ - http-support.c ipp.c ipp-support.c md5passwd.c \ - request.c + http.h ipp.h auth.c getdevices.c getputfile.c encode.c \ + http.c http-addr.c http-support.c ipp.c ipp-support.c \ + md5passwd.c request.c mxmldoc --framed api-filter \ --section "Programming" \ --title "Filter and Backend Programming" \ --css ../doc/cups-printable.css \ --header api-filter.header --intro api-filter.shtml \ - backchannel.c backend.h backend.c sidechannel.c sidechannel.h \ - snmp.c snmp.h + backchannel.c backend.h backend.c sidechannel.c sidechannel.h #