Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4130
Modified Files:
Jamfile Makefile.am autogen.sh configure.ac
Log Message:
add a dist target to jam
Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.ac 23 Nov 2004 16:47:22 -0000 1.37
+++ configure.ac 23 Nov 2004 19:36:27 -0000 1.38
@@ -127,7 +127,7 @@
AC_INIT_JAM
AC_CONFIG_FILES([Jamconfig])
-AC_OUTPUT(Makefile m4/Makefile intl/Makefile
+AC_OUTPUT(Makefile intl/Makefile
src/Makefile
data/Makefile
po/Makefile.in
Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile.am 20 Jul 2004 18:00:43 -0000 1.8
+++ Makefile.am 23 Nov 2004 19:36:27 -0000 1.9
@@ -1,4 +1,4 @@
-SUBDIRS = intl m4 lib src data po
+SUBDIRS = intl lib src data po
EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I mk/autoconf
AUTOMAKE_OPTIONS = 1.6 dist-bzip2
Index: Jamfile
===================================================================
RCS file: /cvsroot/super-tux/supertux/Jamfile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Jamfile 23 Nov 2004 16:47:22 -0000 1.1
+++ Jamfile 23 Nov 2004 19:36:27 -0000 1.2
@@ -5,3 +5,13 @@
SubInclude TOP src ;
SubInclude TOP data ;
+UseAutoconf ;
+
+# for now...
+Package [ Wildcard po : *.po *.in Changelog ] ;
+Package [ Wildcard intl : *.c *.h ChangeLog VERSION Makefile.in ] ;
+Package INSTALL NEWS README COPYING AUTHORS ChangeLog ABOUT-NLS depcomp
+ install-sh mkinstalldirs missing ;
+
+Package Makefile.am src/Makefile.am lib/Makefile.am data/Makefile.am
+ po/Makefile.in.in intl/Makefile.in ;
Index: autogen.sh
===================================================================
RCS file: /cvsroot/super-tux/supertux/autogen.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- autogen.sh 23 Nov 2004 16:47:22 -0000 1.11
+++ autogen.sh 23 Nov 2004 19:36:27 -0000 1.12
@@ -6,6 +6,10 @@
exit 1
fi
+autoheader
+libtoolize --force
+aclocal -I mk/autoconf
+
# generate Jamconfig.in
autoconf --trace=AC_SUBST \
| sed -e 's/configure.ac:[0-9]*:AC_SUBST:\([^:]*\).*/\1 ?= "@\1@" ;/g' \
@@ -19,9 +23,6 @@
# see AUTOMAKE_OPTIONS in Makefile.am
export WANT_AUTOMAKE=1.6
-autoheader
-libtoolize --force
-aclocal -I mk/autoconf
automake --copy --add-missing
autoconf
|
