X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=am%2Ffooter.mk;h=07511c82f943a8ab7148d745adf956683588b1a3;hb=dc1e2fe77a99263de102a8e1d8819e929339a7bb;hp=25fae74ee39caf0a6d57bee1aa0f0984a42ca740;hpb=edb2c7a3bdc2405edf6fd9d6358e0551125f4d1b;p=apps%2Fmadtty.git

diff --git a/am/footer.mk b/am/footer.mk
index 25fae74..07511c8 100644
--- a/am/footer.mk
+++ b/am/footer.mk
@@ -42,7 +42,7 @@ define CLASS_PROGRAMS_tpl
 
   $1: $$(call deps_create,$$($1_SOURCES),$(_cobjs)/$1)
 	$(CC) $$(CFLAGS) $$($1_CPPFLAGS) -o $$@ $$(filter %.o,$$^) \
-		$$(LDFLAGS) $$($1_LDFLAGS) $$($1_LIBADD)
+		$$(LDFLAGS) $$($1_LDFLAGS) $$($1_LDADD)
 
   $$(eval $$(call RULE_C_tpl,$1,))
 
@@ -68,7 +68,7 @@ define CLASS_LIBRARIES_tpl
 
   $1.so$3: $$(call deps_create,$$($1_SOURCES),$(_cobjs)/$1)
 	$(CC) $$(CFLAGS) $$($1_CPPFLAGS) -fPIC -shared -o $$@ $$(filter %.o,$$^) \
-		$$(LDFLAGS) $$($1_LDFLAGS) $$($1_LIBADD)
+		$$(LDFLAGS) $$($1_LDFLAGS) $$($1_LDADD)
 	$$(if $$(word 2,$$(subst ., ,$3)),ln -sf $$@ $1.so.$$(word 1,$$(subst ., ,$3)))
 	$$(if $$($1_VERSION), ln -sf $$@ $1.so)
 
@@ -102,6 +102,16 @@ install-SCRIPTS/%::
 
 install:: $(foreach v,$(filter %_SCRIPTS,$(.VARIABLES)),$(patsubst %_SCRIPTS,install-SCRIPTS/%,$v))
 
+##
+##  rules for *_HEADERS
+##
+
+install-HEADERS/%::
+	$(if $($*dir), $(INSTALL_DIR) $(DESTDIR)$($*dir))
+	$(if $($*dir), $(INSTALL_DATA) $($*_HEADERS) $(DESTDIR)$($*dir))
+
+install:: $(foreach v,$(filter %_HEADERS,$(.VARIABLES)),$(patsubst %_HEADERS,install-HEADERS/%,$v))
+
 
 ########################################################################}}}#
 #[ Candy ]##############################################################{{{#
@@ -128,7 +138,7 @@ endif
 ########################################################################}}}#
 
 all check clobber distclean install::
-	@set -e $(patsubst %,; $(MAKE) -rC % $@,$(SUBDIRS))
+	@$(if $(SUBDIRS),set -e $(patsubst %,; $(MAKE) -rC % $@,$(SUBDIRS)))
 
 CLEAN_RECURSE=1
 clean::
@@ -138,6 +148,7 @@ clean::
 clobber distclean:: CLEAN_RECURSE=
 clobber distclean:: clean
 	$(RM) -r .objs* $(DISTCLEANFILES)
+	@[ -f Makefile.in ] && $(RM) Makefile
 
 ifeq (".","$(DEPTH)")
 clobber distclean::