[Gpg4win-commits] r276 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2006-04-22 04:10:27 +0200 (Sat, 22 Apr 2006)
New Revision: 276

Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
Log:
2006-04-22  Marcus Brinkmann  <marcus at g10code.de>

	* src/Makefile.am (gpg4win_spkgs): Move man_novice_de and
	man_advanced_de to ...
	(gpg4win_ipkgs): ... here.
	* src/gpg4win.mk.in (IPKG_template): New template.
	Insert it for each internal package.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-04-20 14:29:10 UTC (rev 275)
+++ trunk/ChangeLog	2006-04-22 02:10:27 UTC (rev 276)
@@ -1,3 +1,11 @@
+2006-04-22  Marcus Brinkmann  <marcus at g10code.de>
+
+	* src/Makefile.am (gpg4win_spkgs): Move man_novice_de and
+	man_advanced_de to ...
+	(gpg4win_ipkgs): ... here.
+	* src/gpg4win.mk.in (IPKG_template): New template.
+	Insert it for each internal package.
+
 2006-04-20  Werner Koch  <wk at g10code.com>
 
 	* src/installer.nsi: Pop up a message before shutting down winpt.

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2006-04-20 14:29:10 UTC (rev 275)
+++ trunk/src/Makefile.am	2006-04-22 02:10:27 UTC (rev 276)
@@ -28,8 +28,7 @@
              installer-options.ini
 
 # Supported source packages.
-gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws \
-                 man_novice_de man_advanced_de
+gpg4win_spkgs := glib gnupg libgpg-error gpgme gpgol gpa winpt sylpheed-claws
 
 # Extra options to configure for individual packages.
 # We can use $(idir) here for the installation prefix.
@@ -165,6 +164,12 @@
 endef
 
 
+# Supported internal packages.  Internal packages do not require any
+# special support.  Thus, this variable is actually unused, and no
+# rules are added in gpg4win.mk.
+gpg4win_ipkgs := man_novice_de man_advanced_de
+
+
 # Now do the bunch of the work.  This is a bunch of dirty magic to
 # integrate our special makefile into automake, while not actually
 # including it (make should include it).  This is in turn necessary

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2006-04-20 14:29:10 UTC (rev 275)
+++ trunk/src/gpg4win.mk.in	2006-04-22 02:10:27 UTC (rev 276)
@@ -239,6 +239,15 @@
 endef
 
 
+# Template for source packages.
+
+define IPKG_template
+
+stamps/stamp-final-$(1):
+	touch stamps/stamp-final-$(1)
+endef
+
+
 # Insert the template for each source package.
 $(foreach spkg, $(gpg4win_spkgs), $(eval $(call SPKG_template,$(spkg))))
 
@@ -248,6 +257,9 @@
 # Insert the template for each binary package.
 $(foreach bpkg, $(gpg4win_bpkgs), $(eval $(call BPKG_template,$(bpkg))))
 
+# Insert the template for each internal package.
+$(foreach ipkg, $(gpg4win_ipkgs), $(eval $(call IPKG_template,$(ipkg))))
+
 stamps/stamp-final: stamps/stamp-directories
 stamps/stamp-final: $(addprefix stamps/stamp-final-,$(gpg4win_build_list))
 	touch stamps/stamp-final