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

diff --git a/am/footer.mk b/am/footer.mk
index 49a1afd..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,))
 
@@ -61,14 +61,16 @@ install-LIBRARIES/%::
 	$(if $($*dir),$(INSTALL_DATA) $($*_LIBRARIES:=.so*) $(DESTDIR)$($*dir))
 
 define CLASS_LIBRARIES_tpl
-  all:: $1.so$$(if $$($1_VERSION),.$$($1_VERSION))
-  install-LIBRARIES/$2:: $1.so$$(if $$($1_VERSION),.$$($1_VERSION))
+  all:: $1.so$3
+  install-LIBRARIES/$2:: $1.so$3
 
   install:: install-LIBRARIES/$2
 
-  $1.so$$(if $$($1_VERSION),.$$($1_VERSION)): $$(call deps_create,$$($1_SOURCES),$(_cobjs)/$1)
+  $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)
 
   $$(eval $$(call RULE_C_tpl,$1,-fPIC))
 
@@ -76,7 +78,8 @@ define CLASS_LIBRARIES_tpl
 	    $(RM) $1.so*
 endef
 $(foreach v,$(filter %_LIBRARIES,$(.VARIABLES)), \
-            $(foreach x,$($v),$(eval $(call CLASS_LIBRARIES_tpl,$x,$(v:_LIBRARIES=)))))
+            $(foreach x,$($v),$(eval $(call CLASS_LIBRARIES_tpl,$x,$(v:_LIBRARIES=),$(...\
+	    ...)$(if $($x_VERSION),.$($x_VERSION))))))
 
 
 ##
@@ -99,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 ]##############################################################{{{#
@@ -124,8 +137,8 @@ endif
 
 ########################################################################}}}#
 
-all check clobber distclean::
-	@set -e $(patsubst %,; $(MAKE) -rC % $@,$(SUBDIRS))
+all check clobber distclean install::
+	@$(if $(SUBDIRS),set -e $(patsubst %,; $(MAKE) -rC % $@,$(SUBDIRS)))
 
 CLEAN_RECURSE=1
 clean::
@@ -135,6 +148,7 @@ clean::
 clobber distclean:: CLEAN_RECURSE=
 clobber distclean:: clean
 	$(RM) -r .objs* $(DISTCLEANFILES)
+	@[ -f Makefile.in ] && $(RM) Makefile
 
 ifeq (".","$(DEPTH)")
 clobber distclean::