diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-18 14:36:16 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2018-10-18 14:36:16 -0400 |
| commit | 78312b3c7af4094e6d7039a316c6bd9f354df219 (patch) | |
| tree | e8fdada6db99ba2ab3a34ce3c840eb934b5c2873 /cgi-bin | |
| parent | fb863569eb4f51ae62a066dc8049d3ffc0efb0bb (diff) | |
| download | cups-78312b3c7af4094e6d7039a316c6bd9f354df219.tar.gz | |
Don't install/remove private headers for internal libraries.
Don't install symlinks for internal libraries.
Diffstat (limited to 'cgi-bin')
| -rw-r--r-- | cgi-bin/Makefile | 55 |
1 files changed, 13 insertions, 42 deletions
diff --git a/cgi-bin/Makefile b/cgi-bin/Makefile index e25377e22..683348b8d 100644 --- a/cgi-bin/Makefile +++ b/cgi-bin/Makefile @@ -58,7 +58,7 @@ all: $(TARGETS) # Make library targets... # -libs: $(LIBTARGETS) $(UNITTESTS) +libs: # @@ -74,7 +74,7 @@ unittests: $(UNITTARGETS) clean: $(RM) $(OBJS) $(TARGETS) $(UNITTARGETS) makedocset - $(RM) libcupscgi.so libcupscgi.dylib + $(RM) libcupscgi.so libcupscgi.dylib libcupscgi.a # @@ -104,6 +104,16 @@ install-data: # install-exec: + if test $(LIBCUPSCGI) != libcupscgi.a; then \ + echo Installing libraries in $(LIBDIR)...; \ + $(INSTALL_DIR) -m 755 $(LIBDIR); \ + $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR); \ + fi + if test "x$(SYMROOT)" != "x"; then \ + $(INSTALL_DIR) $(SYMROOT); \ + cp $(LIBCUPSCGI) $(SYMROOT); \ + dsymutil $(SYMROOT)/$(LIBCUPSCGI); \ + fi $(INSTALL_DIR) -m 755 $(SERVERBIN)/cgi-bin for file in $(CGIS); do \ $(INSTALL_BIN) $$file $(SERVERBIN)/cgi-bin; \ @@ -128,29 +138,7 @@ install-headers: # Install libraries... # -install-libs: $(INSTALLSTATIC) - echo Installing libraries in $(LIBDIR)... - $(INSTALL_DIR) -m 755 $(LIBDIR) - $(INSTALL_LIB) $(LIBCUPSCGI) $(LIBDIR) - if test $(LIBCUPSCGI) = "libcupscgi.so.1"; then \ - $(RM) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \ - $(LN) $(LIBCUPSCGI) $(LIBDIR)/`basename $(LIBCUPSCGI) .1`; \ - fi - if test $(LIBCUPSCGI) = "libcupscgi.1.dylib"; then \ - $(RM) $(LIBDIR)/libcupscgi.dylib; \ - $(LN) $(LIBCUPSCGI) $(LIBDIR)/libcupscgi.dylib; \ - fi - if test "x$(SYMROOT)" != "x"; then \ - $(INSTALL_DIR) $(SYMROOT); \ - cp $(LIBCUPSCGI) $(SYMROOT); \ - dsymutil $(SYMROOT)/$(LIBCUPSCGI); \ - fi - -installstatic: - $(INSTALL_DIR) -m 755 $(LIBDIR) - $(INSTALL_LIB) -m 755 libcupscgi.a $(LIBDIR) - $(RANLIB) $(LIBDIR)/libcupscgi.a - $(CHMOD) 555 $(LIBDIR)/libcupscgi.a +install-libs: # @@ -168,11 +156,6 @@ uninstall: $(RM) $(LIBDIR)/libcupscgi.so $(RM) $(LIBDIR)/libcupscgi.so.1 -$(RMDIR) $(LIBDIR) - -if test "x$(privateinclude)" != x; then \ - $(RM) $(PRIVATEINCLUDE)/cgi.h; \ - $(RM) $(PRIVATEINCLUDE)/help-index.h; \ - $(RMDIR) $(PRIVATEINCLUDE); \ - fi # @@ -265,18 +248,6 @@ jobs.cgi: jobs.o ../Makedefs ../cups/$(LIBCUPS) $(LIBCUPSCGI) # -# makedocset -# - -makedocset: makedocset.o ../Makedefs libcupscgi.a ../cups/$(LIBCUPSSTATIC) - echo Linking $@... - $(LD_CC) $(ARCHFLAGS) $(LDFLAGS) -o $@ makedocset.o libcupscgi.a \ - ../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(SSLLIBS) $(DNSSDLIBS) \ - $(LIBZ) $(LIBGSSAPI) - $(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@ - - -# # printers.cgi # |