[Makebo-commits] jlbec commits r9 - trunk

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-04-29 03:56:51 -0500 (Sat, 29 Apr 2006)
New Revision: 9

Modified:
   trunk/Postamble.make
   trunk/Preamble.make
Log:

o Update with UNINST_LIBRARIES
o make install for headers/libraries.



Modified: trunk/Postamble.make
===================================================================
--- trunk/Postamble.make	2004-03-03 01:14:26 UTC (rev 8)
+++ trunk/Postamble.make	2006-04-29 08:56:51 UTC (rev 9)
@@ -37,7 +37,7 @@
 LOCAL_CPPFLAGS = $($(subst /,_,$(basename $@))_CPPFLAGS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(INCLUDES) $(DEFINES) $(VERMAGIC) -o $@ -c $<
+	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(INCLUDES) $(DEFINES) $(VERMAGIC) $(CDEPFLAGS) -o $@ -c $<
 
 %.p: %.c
 	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) $(INCLUDES) $(DEFINES) $(VERMAGIC) -E -o $@ -c $<
@@ -54,18 +54,46 @@
 	$(MAKE) -C $@
 
 .PHONY: all-rules
-all-rules: subdirs $(LIBRARIES) $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(NOINST_PROGRAMS) $(MODULES) $(MANS) $(ALL_RULES)
+all-rules: subdirs $(UNINST_LIBRARIES) $(LIBRARIES) $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(UNINST_PROGRAMS) $(MODULES) $(MANS)
 
 
 INSTALL_SUBDIRS = $(addsuffix -install,$(SUBDIRS))
 
-.PHONY: install-rules install-subdirs $(INSTALL_RULES) install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra
+.PHONY: install-rules install-subdirs $(INSTALL_RULES) install-libraries install-headers install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra
 
 install-subdirs: $(INSTALL_SUBDIRS)
 
 $(INSTALL_SUBDIRS):
 	$(MAKE) -C $(subst -install,,$@) install
 
+install-libraries: $(LIBRARIES)
+ifdef LIBRARIES
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(libdir)
+	for lib in $(LIBRARIES); do \
+	  $(INSTALL_LIBRARY) $$lib $(DESTDIR)$(libdir)/$$lib; \
+	done
+endif
+
+ifeq ($(filter /%,$(HEADERS_SUBDIR)),)
+Hsubdir = /$(HEADERS_SUBDIR)
+else
+Hsubdir = $(HEADERS_SUBDIR)
+endif
+
+ifeq ($(filter include/%,$(HEADERS)),)
+Hinstall = 
+else
+Hinstall = include/
+endif
+
+install-headers: $(HEADERS)
+ifdef HEADERS
+	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(includedir)$(Hsubdir)
+	for hdr in $(patsubst include/%,%,$(HEADERS)); do \
+	  $(INSTALL_HEADER) $(Hinstall)$$hdr $(DESTDIR)$(includedir)$(Hsubdir)/$$hdr; \
+	done
+endif
+
 install-bin-programs: $(BIN_PROGRAMS)
 ifdef BIN_PROGRAMS
 	$(SHELL) $(TOPDIR)/mkinstalldirs $(DESTDIR)$(bindir)
@@ -108,7 +136,7 @@
 	done
 endif
 
-install-rules: install-subdirs $(INSTALL_RULES) install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra install-mans
+install-rules: install-subdirs $(INSTALL_RULES) install-libraries install-headers install-bin-programs install-bin-extra install-sbin-programs install-sbin-extra install-mans
 
 
 CLEAN_SUBDIRS = $(addsuffix -clean,$(SUBDIRS))
@@ -121,7 +149,7 @@
 	$(MAKE) -C $(subst -clean,,$@) clean
 
 clean: clean-subdirs $(CLEAN_RULES)
-	rm -f *.o *.p core $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(LIBRARIES) $(CLEAN_FILES) stamp-md5
+	rm -f *.o *.p .*.d core $(BIN_PROGRAMS) $(SBIN_PROGRAMS) $(UNINST_PROGRAMS) $(LIBRARIES) $(UNINST_LIBRARIES) $(CLEAN_FILES) stamp-md5
 
 
 DIST_SUBDIRS = $(addsuffix -dist,$(SUBDIRS))
@@ -146,7 +174,7 @@
         done
 
 dist-all: dist-copy dist-subdirs
-	 
+
 dist-bye:
 	-rm -rf $(DIST_TOPDIR)
 
@@ -160,9 +188,13 @@
 distclean: clean
 	rm -f Config.make config.status config.cache config.log
 
+
+LOCAL_DFILES := $(wildcard .*.d)
+ifneq ($(LOCAL_DFILES),)
+.PHONY: $(LOCAL_DFILES)
+-include $(LOCAL_DFILES)
+endif
+
 ifeq (Cscope.make,$(wildcard Cscope.make))
 include Cscope.make
 endif
-
-
-

Modified: trunk/Preamble.make
===================================================================
--- trunk/Preamble.make	2004-03-03 01:14:26 UTC (rev 8)
+++ trunk/Preamble.make	2006-04-29 08:56:51 UTC (rev 9)
@@ -7,11 +7,15 @@
 endif
 
 LIBRARIES =
-PROGRAMS =
+UNINST_LIBRARIES =
+BIN_PROGRAMS =
+SBIN_PROGRAMS =
+UNINST_PROGRAMS =
 MODULES =
+HEADERS =
 MANS =
 
-ALL_RULES =
+HEADERS_SUBDIR = 
 
 INSTALL_RULES =
 
@@ -26,6 +30,8 @@
 
 CFLAGS += $($(subst /,_,$(basename $@))_CFLAGS)
 CFLAGS += -pipe
+# protect with configure?
+CDEPFLAGS = -MD -MP -MF $(@D)/.$(basename $(@F)).d
 
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^