[Gpg4win-commits] r20 - in trunk: . include src

[marcus at wald.intevation.org]

Author: marcus
Date: 2005-10-20 15:57:20 +0200 (Thu, 20 Oct 2005)
New Revision: 20

Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/TODO
   trunk/include/Makefile.am
   trunk/src/Makefile.am
Log:
2005-10-20  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (EXTRA_DIST): New target.
	* include/Makefile.am (EXTRA_DIST): Change config.nsh.in to
	config.nsi.in.
	* src/Makefile.am (EXTRA_DIST): Remove pkg-config.  Add nsi files.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-10-20 13:43:58 UTC (rev 19)
+++ trunk/ChangeLog	2005-10-20 13:57:20 UTC (rev 20)
@@ -1,5 +1,10 @@
 2005-10-20  Marcus Brinkmann  <marcus at g10code.de>
 
+	* Makefile.am (EXTRA_DIST): New target.
+	* include/Makefile.am (EXTRA_DIST): Change config.nsh.in to
+	config.nsi.in.
+	* src/Makefile.am (EXTRA_DIST): Remove pkg-config.  Add nsi files.
+
 	* src/inst-gpgol.nsi: Change libgpgol-0.9.3.dll to gpgol.dll.
 
 	* src/gpg4win.mk.in (stamp/stamp-$(1)-02-configure): Add

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-10-20 13:43:58 UTC (rev 19)
+++ trunk/Makefile.am	2005-10-20 13:57:20 UTC (rev 20)
@@ -20,3 +20,8 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = packages include src
+
+EXTRA_DIST = \
+	patches/gnupg-1.4.2/01-po-subdirs.patch \
+	patches/gpgme-1.1.0/01-gpgme-def.patch \
+	patches/gpgme-1.1.0/02-libtool-dll.patch

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2005-10-20 13:43:58 UTC (rev 19)
+++ trunk/TODO	2005-10-20 13:57:20 UTC (rev 20)
@@ -13,8 +13,6 @@
 
 * Strip the binaries (simple find running over the whole pkgs tree). !!
 
-* Make make dist work. !!
-
 * Finish modularization of installer.  NSIS' macro language is not up
    to the task, so we need a bit of configure/make magic as well (a la
    autoheader). !!!

Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am	2005-10-20 13:43:58 UTC (rev 19)
+++ trunk/include/Makefile.am	2005-10-20 13:57:20 UTC (rev 20)
@@ -17,4 +17,4 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-EXTRA_DIST = config.nsh.in
+EXTRA_DIST = config.nsi.in

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2005-10-20 13:43:58 UTC (rev 19)
+++ trunk/src/Makefile.am	2005-10-20 13:57:20 UTC (rev 20)
@@ -18,7 +18,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 
-EXTRA_DIST = gpg4win.sh pkg-config
+EXTRA_DIST = pkg-config $(common_nsi) gpg4win.nsi gpg4win-src.nsi
 
 # Supported source packages.
 gpg4win_spkgs := gnupg libgpg-error gpgme gpgol gpa
@@ -101,14 +101,13 @@
 
 clean-local: clean-gpg4win
 
-gpg4win-$(VERSION).exe: gpg4win.nsi inst-sections.nsi \
-   installer.nsi installer-finish.nsi \
-  $(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list))) stamps/stamp-final
+common_nsi := inst-sections.nsi installer.nsi installer-finish.nsi \
+  $(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list)))
+
+gpg4win-$(VERSION).exe: gpg4win.nsi $(common_nsi) stamps/stamp-final
 	$(MAKENSIS) gpg4win.nsi
 
-gpg4win-src-$(VERSION).exe: gpg4win-src.nsi inst-sections.nsi \
-  installer.nsi installer-finish.nsi \
-  $(addsuffix .nsi,$(addprefix inst-,$(gpg4win_build_list))) stamps/stamp-final
+gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsi) stamps/stamp-final
 	$(MAKENSIS) gpg4win-src.nsi
 
 all-local: gpg4win-$(VERSION).exe gpg4win-src-$(VERSION).exe