dotgnu-pnet-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[dotgnu-pnet-commits] pnet ChangeLog auto_gen.sh configure.in libffi/...


From: Klaus Treichel
Subject: [dotgnu-pnet-commits] pnet ChangeLog auto_gen.sh configure.in libffi/...
Date: Sun, 18 Feb 2007 13:31:32 +0000

CVSROOT:        /cvsroot/dotgnu-pnet
Module name:    pnet
Changes by:     Klaus Treichel <ktreichel>      07/02/18 13:31:32

Modified files:
        .              : ChangeLog auto_gen.sh configure.in 
        libffi         : configure.ac Makefile.am 
        libgc          : Makefile.am 
Added files:
        libffi         : auto_gen.sh 
        libgc          : auto_gen.sh 

Log message:
        2007-02-18  Robert Schwebel  <address@hidden>
        
                * auto_gen.sh: Run libtoolize as first step and run auto_gen.sh 
in the
                subdirs libgc and libffi too.
        
                * configure.in: Replace outdated AC_PROG_RANLIB by 
AC_PROG_LIBTOOL.
        
                * libffi/configure.ac: Remove AM_ENABLE_MULTILIB.
        
                * libffi/Makefile.am: Remove the setting of AM_MAKEFLAGS 
because it breaks
                make distcheck. Fix make maintainer-clean by adding 
MAINTAINERCLEANFILES.
        
                * libgc/Makefile.am: Don't distribute libtool.m4. Fix make
                maintainer-clean by adding MAINTAINERCLEANFILES.
        
                * libgc/auto_gen.sh, libffi/auto_gen.sh: Added.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3422&r2=1.3423
http://cvs.savannah.gnu.org/viewcvs/pnet/auto_gen.sh?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnet/configure.in?cvsroot=dotgnu-pnet&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/pnet/libffi/configure.ac?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pnet/libffi/Makefile.am?cvsroot=dotgnu-pnet&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/pnet/libffi/auto_gen.sh?cvsroot=dotgnu-pnet&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/pnet/libgc/Makefile.am?cvsroot=dotgnu-pnet&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pnet/libgc/auto_gen.sh?cvsroot=dotgnu-pnet&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3422
retrieving revision 1.3423
diff -u -b -r1.3422 -r1.3423
--- ChangeLog   18 Feb 2007 08:31:17 -0000      1.3422
+++ ChangeLog   18 Feb 2007 13:31:31 -0000      1.3423
@@ -1,3 +1,20 @@
+2007-02-18  Robert Schwebel  <address@hidden>
+
+       * auto_gen.sh: Run libtoolize as first step and run auto_gen.sh in the
+       subdirs libgc and libffi too.
+
+       * configure.in: Replace outdated AC_PROG_RANLIB by AC_PROG_LIBTOOL.
+
+       * libffi/configure.ac: Remove AM_ENABLE_MULTILIB.
+
+       * libffi/Makefile.am: Remove the setting of AM_MAKEFLAGS because it 
breaks
+       make distcheck. Fix make maintainer-clean by adding 
MAINTAINERCLEANFILES.
+
+       * libgc/Makefile.am: Don't distribute libtool.m4. Fix make
+       maintainer-clean by adding MAINTAINERCLEANFILES.
+
+       * libgc/auto_gen.sh, libffi/auto_gen.sh: Added.
+
 2007-02-18  Klaus Treichel  <address@hidden>
 
        * engine/jitc_array.c: clean up the source.

Index: auto_gen.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/auto_gen.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- auto_gen.sh 6 Feb 2007 20:54:52 -0000       1.4
+++ auto_gen.sh 18 Feb 2007 13:31:32 -0000      1.5
@@ -28,6 +28,9 @@
         echo
 }
 
+banner "running libtool"
+libtoolize --copy --force || exit
+
 banner "running aclocal"
 aclocal --version
 aclocal || exit
@@ -41,4 +44,9 @@
 banner "running autoconf"
 autoconf
 
+for dir in libffi libgc; do
+        pushd $dir
+        sh auto_gen.sh
+        popd
+done
 

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/configure.in,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- configure.in        12 Feb 2007 21:08:59 -0000      1.221
+++ configure.in        18 Feb 2007 13:31:32 -0000      1.222
@@ -16,7 +16,7 @@
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_RANLIB
+AC_PROG_LIBTOOL
 AC_PROG_YACC
 AM_PROG_LEX
 

Index: libffi/configure.ac
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libffi/configure.ac 6 Feb 2007 20:54:53 -0000       1.3
+++ libffi/configure.ac 18 Feb 2007 13:31:32 -0000      1.4
@@ -5,7 +5,7 @@
 AC_INIT([libffi], [2.1], [http://gcc.gnu.org/bugs.html])
 AC_CONFIG_HEADERS([fficonfig.h])
 
-AM_ENABLE_MULTILIB(,)
+# AM_ENABLE_MULTILIB(, ..)
 
 AC_CANONICAL_SYSTEM
 target_alias=${target_alias-$host_alias}

Index: libffi/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libffi/Makefile.am  21 Aug 2005 15:33:24 -0000      1.9
+++ libffi/Makefile.am  18 Feb 2007 13:31:32 -0000      1.10
@@ -35,42 +35,46 @@
 ## This section is for make and multilib madness.
 ##
 
+# FIXME RSC: find out about the reason for the stuff below. Because if
+# it is in, 'make distcheck' doesn't work any more because it looses
+# it's destdir.
+
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS = \
-       "AR_FLAGS=$(AR_FLAGS)" \
-       "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
-       "CFLAGS=$(CFLAGS)" \
-       "CXXFLAGS=$(CXXFLAGS)" \
-       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-       "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
-       "INSTALL=$(INSTALL)" \
-       "INSTALL_DATA=$(INSTALL_DATA)" \
-       "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
-       "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
-       "JC1FLAGS=$(JC1FLAGS)" \
-       "LDFLAGS=$(LDFLAGS)" \
-       "LIBCFLAGS=$(LIBCFLAGS)" \
-       "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
-       "MAKE=$(MAKE)" \
-       "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
-       "PICFLAG=$(PICFLAG)" \
-       "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
-       "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
-       "SHELL=$(SHELL)" \
-       "exec_prefix=$(exec_prefix)" \
-       "infodir=$(infodir)" \
-       "libdir=$(libdir)" \
-       "prefix=$(prefix)" \
-       "AR=$(AR)" \
-       "AS=$(AS)" \
-       "CC=$(CC)" \
-       "CXX=$(CXX)" \
-       "LD=$(LD)" \
-       "NM=$(NM)" \
-       "RANLIB=$(RANLIB)" \
-       "DESTDIR=$(DESTDIR)"
+# AM_MAKEFLAGS = \
+#      "AR_FLAGS=$(AR_FLAGS)" \
+#      "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+#      "CFLAGS=$(CFLAGS)" \
+#      "CXXFLAGS=$(CXXFLAGS)" \
+#      "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+#      "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+#      "INSTALL=$(INSTALL)" \
+#      "INSTALL_DATA=$(INSTALL_DATA)" \
+#      "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+#      "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+#      "JC1FLAGS=$(JC1FLAGS)" \
+#      "LDFLAGS=$(LDFLAGS)" \
+#      "LIBCFLAGS=$(LIBCFLAGS)" \
+#      "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+#      "MAKE=$(MAKE)" \
+#      "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+#      "PICFLAG=$(PICFLAG)" \
+#      "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+#      "RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+#      "SHELL=$(SHELL)" \
+#      "exec_prefix=$(exec_prefix)" \
+#      "infodir=$(infodir)" \
+#      "libdir=$(libdir)" \
+#      "prefix=$(prefix)" \
+#      "AR=$(AR)" \
+#      "AS=$(AS)" \
+#      "CC=$(CC)" \
+#      "CXX=$(CXX)" \
+#      "LD=$(LD)" \
+#      "NM=$(NM)" \
+#      "RANLIB=$(RANLIB)" \
+#      "DESTDIR=$(DESTDIR)"
 
 MAKEOVERRIDES=
 
@@ -155,3 +159,16 @@
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
+
++MAINTAINERCLEANFILES = \
+       configure \
+       Makefile.in \
+       compile \
+       install-sh \
+       config.sub \
+       mkinstalldirs \
+       missing \
+       ltmain.sh \
+       depcomp \
+       config.guess
+

Index: libgc/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libgc/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libgc/Makefile.am   19 Mar 2006 15:22:37 -0000      1.8
+++ libgc/Makefile.am   18 Feb 2007 13:31:32 -0000      1.9
@@ -179,12 +179,28 @@
 #
 CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
 
-# :FIXME: why do we distribute this one???
-#
-EXTRA_DIST += libtool.m4
-
 #
 # :GOTCHA: GNU make rule for making .s out of .S is flawed, 
 # it will not remove dest if building fails
 .S.s:
        if $(CPP) $< >$@ ; then :; else rm -f $@; fi
+
+MAINTAINERCLEANFILES = \
+    Makefile.in \
+    configure \
+    aclocal.m4 \
+    compile \
+    config.guess \
+    config.sub \
+    depcomp \
+    install-sh \
+    ltmain.sh \
+    mdate-sh \
+    missing \
+    libtool.m4 \
+    ltoptions.m4 \
+    ltsugar.m4 \
+    ltversion.m4 \
+    mkinstalldirs \
+    ltconfig
+

Index: libffi/auto_gen.sh
===================================================================
RCS file: libffi/auto_gen.sh
diff -N libffi/auto_gen.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libffi/auto_gen.sh  18 Feb 2007 13:31:32 -0000      1.1
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+#
+# usage:
+#
+# banner <target name>
+#
+banner() {
+    echo
+    TG=`echo $1 | sed -e "s,/.*/,,g"`
+    LINE=`echo $TG |sed -e "s/./-/g"`
+    echo $LINE
+    echo $TG
+    echo $LINE
+    echo
+}
+
+
+ACLOCAL=${ACLOCAL:=aclocal}
+AUTOHEADER=${AUTOHEADER:=autoheader}
+AUTOMAKE=${AUTOMAKE:=automake}
+AUTOCONF=${AUTOCONF:=autoconf}
+
+#$ACLOCAL --version | \
+# awk -vPROG="aclocal" -vVERS=1.7\
+# '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version 
"VERS"\nThis may result in errors\n"}}'
+
+#$AUTOMAKE --version | \
+# awk -vPROG="automake" -vVERS=1.7\
+# '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version 
"VERS"\nThis may result in errors\n"}}'
+
+
+banner "running libtoolize"
+libtoolize --force --copy || exit
+
+banner "running aclocal"
+$ACLOCAL || exit
+
+banner "running autoheader"
+$AUTOHEADER || exit
+
+banner "running automake"
+$AUTOMAKE --gnu --add-missing --copy -Wall || exit
+
+banner "running autoconf"
+$AUTOCONF -Wall || exit
+
+banner "Finished"
+

Index: libgc/auto_gen.sh
===================================================================
RCS file: libgc/auto_gen.sh
diff -N libgc/auto_gen.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ libgc/auto_gen.sh   18 Feb 2007 13:31:32 -0000      1.1
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+#
+# usage:
+#
+# banner <target name>
+#
+banner() {
+    echo
+    TG=`echo $1 | sed -e "s,/.*/,,g"`
+    LINE=`echo $TG |sed -e "s/./-/g"`
+    echo $LINE
+    echo $TG
+    echo $LINE
+    echo
+}
+
+
+ACLOCAL=${ACLOCAL:=aclocal}
+AUTOHEADER=${AUTOHEADER:=autoheader}
+AUTOMAKE=${AUTOMAKE:=automake}
+AUTOCONF=${AUTOCONF:=autoconf}
+
+#$ACLOCAL --version | \
+# awk -vPROG="aclocal" -vVERS=1.7\
+# '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version 
"VERS"\nThis may result in errors\n"}}'
+
+#$AUTOMAKE --version | \
+# awk -vPROG="automake" -vVERS=1.7\
+# '{if ($1 == PROG) {gsub ("-.*","",$4); if ($4 < VERS) print PROG" < version 
"VERS"\nThis may result in errors\n"}}'
+
+banner "running aclocal"
+$ACLOCAL || exit
+
+banner "running libtoolize"
+libtoolize --copy --force || exit
+
+banner "running automake"
+$AUTOMAKE --gnu --add-missing -Wall || exit
+
+banner "running autoconf"
+$AUTOCONF -Wall || exit
+
+banner "Finished"
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]