Fixed a couple of problems

[gnupg.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9793c14..3f1d670 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,44 @@
+# Copyright (C) 1998,1999,2000,2001,2003 Free Software Foundation, Inc.
+#
+# This file is part of GnuPG.
+#
+# GnuPG is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# GnuPG is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks
-EXTRA_DIST = VERSION  PROJECTS BUGS
+ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-selinux-support
+AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
+
+if CROSS_COMPILING
+checks =
+else
+checks = checks
+endif
 
+SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
+EXTRA_DIST = scripts/config.rpath  PROJECTS BUGS config.h.in autogen.sh
+DISTCLEANFILES = g10defs.h 
 
+# Add all the files listed in "distfiles" files to the distribution,
+# apply version numbers to some files and create a VERSION file which
+# we need for the Prereq: patch file trick.
 dist-hook:
        @set -e; \
-        for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \
+        for file in `cd $(top_srcdir); \
+                    find scripts mpi include -type f -name distfiles`; do \
            dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \
            for i in distfiles `cat $(top_srcdir)/$$file` ; do \
                ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \
@@ -16,21 +48,6 @@ dist-hook:
        @set -e; \
        sed -e 's/@pkg_version@/$(VERSION)/g' \
            $(top_srcdir)/scripts/gnupg.spec.in \
-           > $(distdir)/scripts/gnupg.spec
-
-
-# maintainer only
-cvs-get:
-       rsync -Cavuzb  --exclude scratch --exclude .deps \
-                     wkoch@sigtrap.guug.de:work/gnupg .
-
-cvs-put:
-       rsync -Cavuzb --exclude .deps --exclude scratch \
-                     . wkoch@sigtrap.guug.de:work/gnupg
-
-cvs-sync: cvs-get cvs-put
-
-
-
-.PHONY: cvs-get cvs-put cvs-sync
+           > $(distdir)/gnupg.spec
+       echo "$(VERSION)" > $(distdir)/VERSION