[Winpt-commits] r62 - in trunk: . Ico Include PTD Src icons w32gpgme

Thu Nov 3 11:20:09 CET 2005

Author: werner
Date: 2005-11-03 11:20:09 +0100 (Thu, 03 Nov 2005)
New Revision: 62

Added:
   trunk/icons/Makefile.am
Modified:
   trunk/ChangeLog
   trunk/Ico/Makefile.am
   trunk/Include/ChangeLog
   trunk/Include/Makefile.am
   trunk/Makefile.am
   trunk/PTD/Makefile.am
   trunk/Src/Makefile.am
   trunk/autogen.sh
   trunk/configure.ac
   trunk/w32gpgme/Makefile.am
Log:
Yeah, make distcheck works.


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/ChangeLog	2005-11-03 10:20:09 UTC (rev 62)
@@ -1,3 +1,11 @@
+2005-11-03  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (SUBDIRS): Include Ico/ and icons/.
+
+	* configure.ac (W32ROOT): Define it.
+
+	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New.
+
 2005-11-01  Werner Koch  <wk at g10code.com>
 
 	* configure.ac: Use Src/WinPt.cpp and not src/WinPt.cpp

Modified: trunk/Ico/Makefile.am
===================================================================
--- trunk/Ico/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/Ico/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -12,6 +12,6 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST= \
-      Icon.bmp delete.bmp icons.zip properties.bmp
+      Icon.bmp delete.bmp icons.zip properties.bmp \
       Icon2.bmp Thumbs.db export.bmp import.bmp sign.bmp
 

Modified: trunk/Include/ChangeLog
===================================================================
--- trunk/Include/ChangeLog	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/Include/ChangeLog	2005-11-03 10:20:09 UTC (rev 62)
@@ -1,3 +1,8 @@
+2005-11-03  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (EXTRA_DIST): Add wptCardEdit.h, wptListView.h,
+	wptImagelist.h and gpg.h.
+
 2005-10-31  Werner Koch  <wk at g10code.com>
 
 	* wptVersion.h: Use C linkage for PTD functions.

Modified: trunk/Include/Makefile.am
===================================================================
--- trunk/Include/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/Include/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -12,8 +12,10 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST= \
+	gpg.h \
 	wptAgent.h \
 	wptCard.h \
+	wptCardEdit.h \
 	wptCommonCtl.h \
 	wptContext.h \
 	wptCryptdisk.h \
@@ -27,6 +29,8 @@
 	wptHTTP.h \
 	wptKeyEdit.h \
 	wptKeylist.h \
+        wptListView.h \
+        wptImagelist.h \
 	wptKeyManager.h \
 	wptKeyserver.h \
 	wptNLS.h \

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -13,14 +13,14 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc \
+                            --with-gpg-error-prefix=@W32ROOT@ \
+	                    --with-gpgme-prefix=@W32ROOT@ 
 
+
 EXTRA_DIST = autogen.sh README.SVN
 
-SUBDIRS = Gnupg w32gpgme PTD Src Include
+SUBDIRS = Gnupg w32gpgme PTD Src Include Ico icons m4
 
 dist-hook:
 	echo "$(VERSION)" > $(distdir)/VERSION
-
-
-
-

Modified: trunk/PTD/Makefile.am
===================================================================
--- trunk/PTD/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/PTD/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -15,7 +15,8 @@
 EXTRA_DIST = versioninfo.rc.in
 EXEEXT = .dll
 
-AM_CPPFLAGS = -I../w32gpgme -I../Include -I../Gnupg \
+AM_CPPFLAGS = -I$(top_srcdir)/w32gpgme -I$(top_srcdir)/Include \
+	      -I$(top_srcdir)/Gnupg \
               -DWIN32 -D_WINDOWS -D_MBCS -D_USRDLL -DPTD_EXPORTS
 AM_CFLAGS   = -fexceptions  $(GPGME_CFLAGS) -shared
 AM_CXXFLAGS = -fexceptions  $(GPGME_CFLAGS) -shared

Modified: trunk/Src/Makefile.am
===================================================================
--- trunk/Src/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/Src/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -14,7 +14,8 @@
 bin_PROGRAMS = WinPT    #2KeyManagerExe
 EXTRA_DIST = versioninfo.rc.in 
 
-AM_CPPFLAGS = -I../w32gpgme -I../Include -I../Gnupg -I../PTD  \
+AM_CPPFLAGS = -I$(top_srcdir)/w32gpgme -I$(top_srcdir)/Include \
+              -I$(top_srcdir)/Gnupg -I$(top_srcdir)/PTD  \
               -DWIN32 -D_WINDOWS -D_MBCS
 AM_CFLAGS   = -fexceptions  $(GPGME_CFLAGS)
 AM_CXXFLAGS = -fexceptions  $(GPGME_CFLAGS)

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/autogen.sh	2005-11-03 10:20:09 UTC (rev 62)
@@ -50,6 +50,7 @@
     build=`$tsdir/config.guess`
 
     [ -z "$w32root" ] && w32root="$HOME/w32root"
+    export w32root
     echo "Using $w32root as standard install directory" >&2
     
     # See whether we have the Debian cross compiler package installed

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/configure.ac	2005-11-03 10:20:09 UTC (rev 62)
@@ -51,7 +51,18 @@
 changequote([,])dnl
 AC_SUBST(BUILD_FILEVERSION)
 
+# For the distcheck target of make we need to set a few options for
+# the cross compiling environment.  We assume the same conevtion as
+# used in autogen.sh; i.e. we take the root from the $w32root variable
+# or default to ~/w32root.
+if test -n "$w32root"; then 
+  W32ROOT="$w32root"
+else
+  W32ROOT="$HOME/w32root"
+fi
+AC_SUBST(W32ROOT)
 
+
 AH_BOTTOM([
 /* Some global constants. */
 
@@ -226,6 +237,7 @@
 Src/versioninfo.rc        
 Include/Makefile
 Ico/Makefile
+icons/Makefile
 m4/Makefile
 w32gpgme/Makefile
 Gnupg/Makefile

Added: trunk/icons/Makefile.am
===================================================================
--- trunk/icons/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/icons/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -0,0 +1,16 @@
+# Makefile.am - makefile for WinPT
+# Copyright (C) 2005 g10 Code GmbH
+# 
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+## Process this file with automake to produce Makefile.in
+
+EXTRA_DIST= \
+      key_delete.ico key_export.ico key_import.ico key_props.ico \
+      key_sign.ico sort_downarrow.ico sort_uparrow.ico
\ No newline at end of file


Property changes on: trunk/icons/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/w32gpgme/Makefile.am
===================================================================
--- trunk/w32gpgme/Makefile.am	2005-11-02 14:48:01 UTC (rev 61)
+++ trunk/w32gpgme/Makefile.am	2005-11-03 10:20:09 UTC (rev 62)
@@ -15,7 +15,8 @@
 
 noinst_LIBRARIES = libw32gpgme.a
 
-AM_CPPFLAGS =  -DWIN32 -D_MBCS -D_LIB -I../Include -I../Gnupg
+AM_CPPFLAGS = -DWIN32 -D_MBCS -D_LIB \
+              -I$(top_srcdir)/Include -I$(top_srcdir)/Gnupg
 AM_CFLAGS   = -fexceptions  $(GPGME_CFLAGS)
 
 libw32gpgme_a_SOURCES = card.c clip.c data.c w32-clip.c w32gpgme.h 

