Update build system to support separate installs of headers, libraries, data

[thirdparty/cups.git] / cups / Makefile

diff --git a/cups/Makefile b/cups/Makefile
index 6ab2d7940d4b5c46c55c33b73dbe23c88e6a5832..3702a1790621d9de8421c9ab453dddc57da3706d 100644 (file)
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -156,10 +156,42 @@ depend:
 
 
 #
-# Install object and target files...
+# Install all targets...
 #
 
-install:       all installhdrs $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
+install:       all install-data install-headers install-libs install-exec
+
+
+#
+# Install data files...
+#
+
+install-data:
+
+
+#
+# Install programs...
+#
+
+install-exec:
+
+
+#
+# Install headers...
+#
+
+install-headers:
+       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
+       for file in $(HEADERS); do \
+               $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
+       done
+
+
+#
+# Install libraries...
+#
+
+install-libs: $(INSTALLSTATIC) $(INSTALL32) $(INSTALL64)
        $(INSTALL_DIR) -m 755 $(LIBDIR)
        $(INSTALL_LIB) $(LIBCUPS) $(LIBDIR)
        if test $(LIBCUPS) = "libcups.so.2" -o $(LIBCUPS) = "libcups.sl.2"; then \
@@ -183,12 +215,6 @@ installstatic:
        $(INSTALL_LIB) libcups.a $(LIBDIR)
        $(RANLIB) $(LIBDIR)/libcups.a
 
-installhdrs:
-       $(INSTALL_DIR) -m 755 $(INCLUDEDIR)/cups
-       for file in $(HEADERS); do \
-               $(INSTALL_DATA) $$file $(INCLUDEDIR)/cups; \
-       done
-
 install32bit:
        $(INSTALL_DIR) -m 755 $(LIB32DIR)
        $(INSTALL_LIB) 32bit/libcups.so.2 $(LIB32DIR)/libcups.so.2