[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] pnet ChangeLog Makefile.am auto_gen.sh configur...
|
From: |
Klaus Treichel |
|
Subject: |
[dotgnu-pnet-commits] pnet ChangeLog Makefile.am auto_gen.sh configur... |
|
Date: |
Tue, 06 Feb 2007 20:54:54 +0000 |
CVSROOT: /cvsroot/dotgnu-pnet
Module name: pnet
Changes by: Klaus Treichel <ktreichel> 07/02/06 20:54:53
Modified files:
. : ChangeLog Makefile.am auto_gen.sh configure.in
codegen : Makefile.am
cscc/bf : Makefile.am bf_defs.tc
cscc/c : Makefile.am c_defs.tc
cscc/common : Makefile.am
cscc/csharp : Makefile.am cs_defs.tc
cscc/java : Makefile.am java_defs.tc
csdoc : Makefile.am
doc : Makefile.am mkcvmdoc.sh
engine : Makefile.am
ilasm : Makefile.am
include : Makefile.am
resgen : Makefile.am
samples : Makefile.am
tests : Makefile.am
libffi : configure configure.ac
Added files:
profiles : Makefile.am
Log message:
Fix make distclean (by Robert Schwebel). The patch was modified by me
so if it
breaks the build blame me too ;)
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3409&r2=1.3410
http://cvs.savannah.gnu.org/viewcvs/pnet/Makefile.am?cvsroot=dotgnu-pnet&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/pnet/auto_gen.sh?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pnet/configure.in?cvsroot=dotgnu-pnet&r1=1.219&r2=1.220
http://cvs.savannah.gnu.org/viewcvs/pnet/codegen/Makefile.am?cvsroot=dotgnu-pnet&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/bf/Makefile.am?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/bf/bf_defs.tc?cvsroot=dotgnu-pnet&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/c/Makefile.am?cvsroot=dotgnu-pnet&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/c/c_defs.tc?cvsroot=dotgnu-pnet&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/common/Makefile.am?cvsroot=dotgnu-pnet&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/csharp/Makefile.am?cvsroot=dotgnu-pnet&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/csharp/cs_defs.tc?cvsroot=dotgnu-pnet&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/java/Makefile.am?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnet/cscc/java/java_defs.tc?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pnet/csdoc/Makefile.am?cvsroot=dotgnu-pnet&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pnet/doc/Makefile.am?cvsroot=dotgnu-pnet&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pnet/doc/mkcvmdoc.sh?cvsroot=dotgnu-pnet&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/Makefile.am?cvsroot=dotgnu-pnet&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/pnet/ilasm/Makefile.am?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pnet/include/Makefile.am?cvsroot=dotgnu-pnet&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pnet/resgen/Makefile.am?cvsroot=dotgnu-pnet&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pnet/samples/Makefile.am?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/pnet/tests/Makefile.am?cvsroot=dotgnu-pnet&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pnet/libffi/configure?cvsroot=dotgnu-pnet&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pnet/libffi/configure.ac?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pnet/profiles/Makefile.am?cvsroot=dotgnu-pnet&rev=1.1
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3409
retrieving revision 1.3410
diff -u -b -r1.3409 -r1.3410
--- ChangeLog 2 Feb 2007 15:39:50 -0000 1.3409
+++ ChangeLog 6 Feb 2007 20:54:52 -0000 1.3410
@@ -1,3 +1,25 @@
+2007-02-06 Klaus Treichel <address@hidden>
+
+ * libffi/configure.ac, libffi/configure: Remuve the testsuite from the
+ subdirs and fix the multilib support for pnet.
+
+2007-02-06 Robert Schwebel <address@hidden>
+
+ * Makefile.am, auto_gen.sh, configure.in, codegen/Makefile.am,
+ cscc/bf/Makefile.am, cscc/bf/bf_defs.tc, cscc/c/Makefile.am,
+ cscc/c/c_defs.tc, cscc/common/Makefile.am, cscc/csharp/Makefile.am,
+ cscc/csharp/cs_defs.tc, cscc/java/Makefile.am, cscc/java/java_defs.tc,
+ csdoc/Makefile.am, doc/Makefile.am, doc/mkcvmdoc.sh, engine/Makefile.am,
+ ilasm/Makefile.am, include/Makefile.am, resgen/Makefile.am,
+ samples/Makefile.am, tests/Makefile.am: Fix build system by adding
missing
+ sources which have to be in the distribution and excluding built
sources.
+ Enable passing all arguments to configure to the configure of libffi and
+ libgc. Pimping auto_gen.sh. Hack the out of tree build in the cscc
subdirs
+ which should be replaced by adding support to specify input- and/or
output
+ dir.
+
+ * profiles/Makefile.am: Added
+
2007-02-02 Radek Polak <address@hidden>
* ilgac/ilgac.c: Fix problem with make uninstall in pnetlib on cygwin.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- Makefile.am 30 Nov 2006 20:12:59 -0000 1.33
+++ Makefile.am 6 Feb 2007 20:54:52 -0000 1.34
@@ -1,29 +1,58 @@
+OPT_SUBDIRS =
+
if USING_LIBFFI
-LIBFFI_DIR = libffi
-else
-LIBFFI_DIR =
+OPT_SUBDIRS += libffi
endif
if USING_LIBGC
-LIBGC_DIR = libgc
-else
-LIBGC_DIR =
+OPT_SUBDIRS += libgc
endif
if PNET_TOOLS
-SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include support image dumpasm engine
ilasm ildasm \
- ilalink ilsize ilnative ilheader ilfind ildd codegen cscc \
- resgen ilstrip ilranlib ilgac csdoc csant clrwrap samples doc
tests
+OPT_SUBDIRS += dumpasm \
+ ilasm \
+ ildasm \
+ ilalink \
+ ilsize \
+ engine \
+ ilnative \
+ ilheader \
+ ilfind \
+ ildd \
+ codegen \
+ cscc \
+ resgen \
+ ilstrip \
+ ilranlib \
+ ilgac \
+ csant \
+ clrwrap \
+ samples \
+ tests
+
+
+if !CROSS_COMPILING
+OPT_SUBDIRS += csdoc doc
+endif
else
## We only want to build the runtime engine.
-SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include coremul support image engine
+OPT_SUBDIRS += coremul \
+ engine
endif
-DIST_SUBDIRS = $(SUBDIRS)
+SUBDIRS = . \
+ include \
+ support \
+ image \
+ profiles \
+ $(OPT_SUBDIRS)
+
EXTRA_DIST = config-ml.in
+MAINTAINERCLEANFILES = Makefile.in \
+ configure
Index: auto_gen.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/auto_gen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- auto_gen.sh 1 Dec 2002 22:58:37 -0000 1.3
+++ auto_gen.sh 6 Feb 2007 20:54:52 -0000 1.4
@@ -18,20 +18,27 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# Run aclocal to update the macros.
-aclocal
+banner() {
+ echo
+ TG=`echo $1 | sed -e "s,/.*/,,g"`
+ LINE=`echo $TG |sed -e "s/./-/g"`
+ echo $LINE
+ echo $TG
+ echo $LINE
+ echo
+}
-# Run autoheader to generate il_config.h.in.
-autoheader
+banner "running aclocal"
+aclocal --version
+aclocal || exit
-# Get extra options to use depending upon the automake version.
-AM_VERSION=`automake --version`
-case "$AM_VERSION" in
- automake*1.4*) AM_FLAGS="" ;;
- *) AM_FLAGS="--ignore-deps" ;;
-esac
+banner "running autoheader"
+autoheader || exit
-# Run automake and autoconf.
-automake --add-missing --copy $AM_FLAGS
+banner "running automake"
+automake --add-missing --copy --ignore-deps || exit
+
+banner "running autoconf"
autoconf
-exit 0
+
+
Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/configure.in,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- configure.in 23 Jan 2007 19:49:01 -0000 1.219
+++ configure.in 6 Feb 2007 20:54:52 -0000 1.220
@@ -20,6 +20,9 @@
AC_PROG_YACC
AM_PROG_LEX
+# Tell everyone if we are crosscompiling
+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
AC_PATH_PROG(TREECC, treecc,, ${prefix}/bin:$PATH)
if test -z "$TREECC" ; then
echo "treecc is required to build and can be obtained from"
@@ -29,6 +32,13 @@
TREECC_VERSION=`"$TREECC" -v | (read name version rest; echo $version)`
AC_SUBST(TREECC_VERSION)
+if test x$cross_compiling = xyes ; then
+ AC_PATH_PROG(ILASM, ilasm)
+else
+ ILASM="\$(top_builddir)/ilasm/ilasm"
+fi
+AC_SUBST(ILASM)
+
AC_PATH_PROG(SYSTEM_AR, ar)
dnl Option to disable cygwin1.dll under Windows.
@@ -679,6 +689,14 @@
fi
AM_CONDITIONAL(USING_LIBGC, test x$withgc = xyes)
+if test x$withffi = xyes; then
+ AC_CONFIG_SUBDIRS(libffi)
+fi
+
+if test x$withgc = xyes; then
+ AC_CONFIG_SUBDIRS(libgc)
+fi
+
AC_OUTPUT([
Makefile
include/Makefile
@@ -714,67 +732,8 @@
samples/Makefile
doc/Makefile
tests/Makefile
-pnet.spec])
-
-dnl Configure libffi and libgc. We do these manually to avoid
-dnl some issues with different versions of autotools, and so that
-dnl we can pass specific options to the packages.
-if test "x$no_recursion" != "xyes"; then
-
- export CC
-
- dnl Figure out how to find the source directory for directories
- dnl under $srcdir from a subdirectory of the build tree. This is
- dnl different depending on whether $srcdir is absolute or relative.
- if echo $srcdir | grep '^[[~/]]'; then
- ffisrcdir=$srcdir/libffi
- gcsrcdir=$srcdir/libgc
- else
- ffisrcdir=../$srcdir/libffi
- gcsrcdir=../$srcdir/libgc
- fi
- if test x$withffi = xyes ; then
- if test ! -d libffi ; then
- mkdir libffi
- fi
- cd "libffi"
- ${CONFIG_SHELL-/bin/sh} ${ffisrcdir}/configure --disable-shared
\
- --enable-multilib=no \
- --disable-dependency-tracking \
- --host="${host}" --build="${build}"
--target="${target}" \
- --disable-fast-install --prefix="${prefix}" \
- --exec-prefix="${exec_prefix}" --bindir="${bindir}" \
- --sbindir="${sbindir}" --libexecdir="${libexecdir}" \
- --datadir="${datadir}" --sysconfdir="${sysconfdir}" \
- --sharedstatedir="${sharedstatedir}" \
- --localstatedir="${localstatedir}"
--libdir="${libdir}/pnet" \
- --includedir="${includedir}/pnet" \
- --oldincludedir="${oldincludedir}/pnet"
--infodir="${infodir}" \
- --mandir="${mandir}" --srcdir="${ffisrcdir}" || exit 1
- cd ..
- fi
-
- if test x$withgc = xyes ; then
- if test ! -d libgc ; then
- mkdir libgc
- fi
- cd libgc
- ${CONFIG_SHELL-/bin/sh} ${gcsrcdir}/configure \
- --enable-threads=$THREADS --host="${host}" \
- --build="${build}" --target="${target}"
--disable-fast-install \
- --prefix="${prefix}" \
- --exec-prefix="${exec_prefix}" --bindir="${bindir}" \
- --sbindir="${sbindir}" --libexecdir="${libexecdir}" \
- --datadir="${datadir}" --sysconfdir="${sysconfdir}" \
- --sharedstatedir="${sharedstatedir}" \
- --localstatedir="${localstatedir}"
--libdir="${libdir}/pnet" \
- --includedir="${includedir}/pnet" \
- --oldincludedir="${oldincludedir}/pnet" \
- --infodir="${infodir}" --mandir="${mandir}" \
- --srcdir="${gcsrcdir}" || exit 1
- cd ..
- fi
-fi
+pnet.spec
+profiles/Makefile])
dnl Local variables:
dnl tab-width: 4
Index: codegen/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/codegen/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- codegen/Makefile.am 22 Aug 2005 12:39:20 -0000 1.12
+++ codegen/Makefile.am 6 Feb 2007 20:54:52 -0000 1.13
@@ -55,6 +55,7 @@
libILCodeGen_a_SOURCES = cg_coerce.c \
cg_coerce.h \
+ cg_defs.h \
cg_gen.c \
cg_gen.h \
cg_interface.c \
@@ -63,6 +64,7 @@
cg_nodemap.h \
cg_optable.c \
cg_output.c \
+ cg_output.h \
cg_rbtree.c \
cg_rbtree.h \
cg_resolve.c \
@@ -74,18 +76,28 @@
cg_varusage.c \
cg_varusage.h \
jv_output.c \
- jv_output.h \
- $(TREECC_SRCOUT)
+ jv_output.h
+
+nodist_libILCodeGen_a_SOURCES = $(TREECC_SRCOUT)
AM_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/include
STAMP = stamp-treecc
-BUILT_SOURCES = $(STAMP)
+BUILT_SOURCES = $(STAMP) $(TREECC_OUTPUT)
libILCodeGen_a_DEPENDENCIES = $(STAMP)
+# Hack alert: if we build out of tree, copy sources to here,
+# because treecc has no option to define the output directory
+
$(STAMP): $(TREECC_INPUTS)
- $(TREECC) $(srcdir)/cg_all.tc && touch $@
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ cp $(srcdir)/*.tc .; \
+ fi
+ $(TREECC) cg_all.tc && touch $@
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ rm -f *.tc; \
+ fi
CLEANFILES = $(TREECC_OUTPUT) $(STAMP)
Index: cscc/bf/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/bf/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cscc/bf/Makefile.am 22 Aug 2005 12:39:20 -0000 1.4
+++ cscc/bf/Makefile.am 6 Feb 2007 20:54:52 -0000 1.5
@@ -6,7 +6,27 @@
TREECC_SRCOUT = bf_nodes.c bf_codegen.c
-TREECC_OUTPUT = $(TREECC_SRCOUT) bf_defs.h
+TREECC_UNUSED_SRCOUT = \
+ cg_lvalue.c \
+ jv_assign.c \
+ cg_logical.c \
+ cg_ainit.c \
+ cg_attrs.c \
+ cg_relop.c \
+ cg_decls.c \
+ cg_arith.c \
+ cg_cast.c \
+ jv_arith.c \
+ cg_const.c \
+ cg_assign.c \
+ cg_nodes.h \
+ jv_cast.c \
+ cg_nodes.c \
+ jv_nodes.c \
+ cg_stmt.c \
+ cg_misc.c
+
+TREECC_OUTPUT = $(TREECC_SRCOUT) $(TREECC_UNUSED_SRCOUT) bf_defs.h
EXTRA_DIST = $(TREECC_INPUTS)
@@ -14,7 +34,9 @@
bf_scanner.l \
bf_optimize.c \
bf_internal.h \
- bf_rename.h \
+ bf_rename.h
+
+nodist_libILBf_a_SOURCES = \
$(TREECC_SRCOUT)
AM_YFLAGS = -d
@@ -23,13 +45,27 @@
STAMP = stamp-treecc
-BUILT_SOURCES = $(STAMP)
+BUILT_SOURCES = $(STAMP) $(TREECC_OUTPUT)
libILBf_a_DEPENDENCIES = $(STAMP)
+# Hack alert: if we build out of tree, copy sources to here,
+# because treecc has no option to define the output directory
+
$(STAMP): $(TREECC_INPUTS) ../../codegen/$(STAMP)
- $(TREECC) $(srcdir)/bf_defs.tc && touch $@
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ cp -f $(srcdir)/*.tc .; \
+ fi; \
+ codegen_tc=`cd $(top_srcdir)/codegen && find . -name "*.tc"`; \
+ for i in $$codegen_tc; do cp $(top_srcdir)/codegen/$$i .; done; \
+ $(TREECC) bf_defs.tc && touch $@; \
+ rm -f $$codegen_tc; \
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ rm -f *.tc; \
+ fi
bf_scanner.l: bf_grammar.c
CLEANFILES = bf_grammar.c bf_scanner.c bf_grammar.h $(TREECC_OUTPUT) $(STAMP)
+
+
Index: cscc/bf/bf_defs.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/bf/bf_defs.tc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cscc/bf/bf_defs.tc 17 May 2003 12:47:46 -0000 1.1
+++ cscc/bf/bf_defs.tc 6 Feb 2007 20:54:52 -0000 1.2
@@ -22,7 +22,7 @@
*/
%}
-%include %readonly "../../codegen/cg_all.tc"
+%include %readonly "cg_all.tc"
%header "bf_defs.h"
%output "bf_nodes.c"
Index: cscc/c/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/c/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- cscc/c/Makefile.am 22 Aug 2005 12:39:20 -0000 1.16
+++ cscc/c/Makefile.am 6 Feb 2007 20:54:52 -0000 1.17
@@ -14,7 +14,27 @@
TREECC_SRCOUT = c_nodes.c c_semantics.c c_name.c
-TREECC_OUTPUT = $(TREECC_SRCOUT) c_defs.h
+TREECC_UNUSED_SRCOUT = \
+ cg_lvalue.c \
+ jv_assign.c \
+ cg_logical.c \
+ cg_ainit.c \
+ cg_attrs.c \
+ cg_relop.c \
+ cg_decls.c \
+ cg_arith.c \
+ cg_cast.c \
+ jv_arith.c \
+ cg_const.c \
+ cg_assign.c \
+ cg_nodes.h \
+ jv_cast.c \
+ cg_nodes.c \
+ jv_nodes.c \
+ cg_stmt.c \
+ cg_misc.c
+
+TREECC_OUTPUT = $(TREECC_SRCOUT) $(TREECC_UNUSED_SRCOUT) c_defs.h
EXTRA_DIST = $(TREECC_INPUTS)
@@ -36,8 +56,9 @@
c_scope.h \
c_typeout.c \
c_types.c \
- c_types.h \
- $(TREECC_SRCOUT)
+ c_types.h
+
+nodist_libILCLang_a_SOURCES = $(TREECC_SRCOUT)
AM_YFLAGS = -d
@@ -45,12 +66,24 @@
STAMP = stamp-treecc
-BUILT_SOURCES = $(STAMP)
+BUILT_SOURCES = $(STAMP) $(TREECC_OUTPUT)
libILCLang_a_DEPENDENCIES = $(STAMP)
-$(STAMP): $(TREECC_INPUTS) ../../codegen/$(STAMP)
- $(TREECC) $(srcdir)/c_defs.tc && touch $@
+# Hack alert: if we build out of tree, copy sources to here,
+# because treecc has no option to define the output directory
+
+$(STAMP): $(TREECC_INPUTS) $(top_builddir)/codegen/$(STAMP)
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ cp -f $(srcdir)/*.tc .; \
+ fi; \
+ codegen_tc=`cd $(top_srcdir)/codegen && find . -name "*.tc"`; \
+ for i in $$codegen_tc; do cp $(top_srcdir)/codegen/$$i .; done; \
+ $(TREECC) c_defs.tc && touch $@; \
+ rm -f $$codegen_tc; \
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ rm -f *.tc; \
+ fi
c_scanner.l: c_grammar.c
Index: cscc/c/c_defs.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/c/c_defs.tc,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- cscc/c/c_defs.tc 15 Mar 2004 06:34:41 -0000 1.34
+++ cscc/c/c_defs.tc 6 Feb 2007 20:54:52 -0000 1.35
@@ -21,7 +21,7 @@
/*
* Inherit the common definitions.
*/
-%include %readonly "../../codegen/cg_all.tc"
+%include %readonly "cg_all.tc"
/*
* Set a new header for definitions that follow.
Index: cscc/common/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/common/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cscc/common/Makefile.am 22 Aug 2005 12:39:20 -0000 1.8
+++ cscc/common/Makefile.am 6 Feb 2007 20:54:52 -0000 1.9
@@ -13,6 +13,7 @@
cc_main.c \
cc_main.h \
cc_options.c \
+ cc_options.h \
cc_preproc.c \
cc_preproc.h
Index: cscc/csharp/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cscc/csharp/Makefile.am 22 Aug 2005 12:39:20 -0000 1.10
+++ cscc/csharp/Makefile.am 6 Feb 2007 20:54:52 -0000 1.11
@@ -15,7 +15,27 @@
TREECC_SRCOUT = cs_nodes.c cs_semantics.c
-TREECC_OUTPUT = $(TREECC_SRCOUT) cs_defs.h
+TREECC_UNUSED_SRCOUT = \
+ cg_lvalue.c \
+ jv_assign.c \
+ cg_logical.c \
+ cg_ainit.c \
+ cg_attrs.c \
+ cg_relop.c \
+ cg_decls.c \
+ cg_arith.c \
+ cg_cast.c \
+ jv_arith.c \
+ cg_const.c \
+ cg_assign.c \
+ cg_nodes.h \
+ jv_cast.c \
+ cg_nodes.c \
+ jv_nodes.c \
+ cg_stmt.c \
+ cg_misc.c
+
+TREECC_OUTPUT = $(TREECC_SRCOUT) $(TREECC_UNUSED_SRCOUT) cs_defs.h
EXTRA_DIST = $(TREECC_INPUTS)
@@ -29,8 +49,9 @@
cs_scanner.l \
cs_semvalue.c \
cs_semvalue.h \
- cs_valdoc.c \
- $(TREECC_SRCOUT)
+ cs_valdoc.c
+
+nodist_libILCSharp_a_SOURCES = $(TREECC_SRCOUT)
AM_YFLAGS = -d
@@ -38,13 +59,26 @@
STAMP = stamp-treecc
-BUILT_SOURCES = $(STAMP)
+BUILT_SOURCES = $(STAMP) $(TREECC_OUTPUT)
libILCSharp_a_DEPENDENCIES = $(STAMP)
+# Hack alert: if we build out of tree, copy sources to here,
+# because treecc has no option to define the output directory
+
$(STAMP): $(TREECC_INPUTS) ../../codegen/$(STAMP)
- $(TREECC) $(srcdir)/cs_defs.tc && touch $@
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ cp -f $(srcdir)/*.tc .; \
+ fi; \
+ codegen_tc=`cd $(top_srcdir)/codegen && find . -name "*.tc"`; \
+ for i in $$codegen_tc; do cp $(top_srcdir)/codegen/$$i .; done; \
+ $(TREECC) cs_defs.tc && touch $@; \
+ rm -f $$codegen_tc; \
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ rm -f *.tc; \
+ fi
cs_scanner.l: cs_grammar.c
CLEANFILES = cs_grammar.c cs_scanner.c cs_grammar.h $(TREECC_OUTPUT) $(STAMP)
+
Index: cscc/csharp/cs_defs.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/csharp/cs_defs.tc,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- cscc/csharp/cs_defs.tc 7 Jul 2004 23:47:37 -0000 1.14
+++ cscc/csharp/cs_defs.tc 6 Feb 2007 20:54:52 -0000 1.15
@@ -21,7 +21,7 @@
/*
* Inherit the common definitions.
*/
-%include %readonly "../../codegen/cg_all.tc"
+%include %readonly "cg_all.tc"
/*
* Set a new header for definitions that follow.
Index: cscc/java/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/java/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cscc/java/Makefile.am 22 Aug 2005 12:39:20 -0000 1.4
+++ cscc/java/Makefile.am 6 Feb 2007 20:54:52 -0000 1.5
@@ -15,7 +15,27 @@
TREECC_SRCOUT = java_nodes.c java_semantics.c
-TREECC_OUTPUT = $(TREECC_SRCOUT) java_defs.h
+TREECC_UNUSED_SRCOUT = \
+ cg_lvalue.c \
+ jv_assign.c \
+ cg_logical.c \
+ cg_ainit.c \
+ cg_attrs.c \
+ cg_relop.c \
+ cg_decls.c \
+ cg_arith.c \
+ cg_cast.c \
+ jv_arith.c \
+ cg_const.c \
+ cg_assign.c \
+ cg_nodes.h \
+ jv_cast.c \
+ cg_nodes.c \
+ jv_nodes.c \
+ cg_stmt.c \
+ cg_misc.c
+
+TREECC_OUTPUT = $(TREECC_SRCOUT) $(TREECC_UNUSED_SRCOUT) java_defs.h
EXTRA_DIST = $(TREECC_INPUTS)
@@ -27,9 +47,9 @@
java_lookup.c \
java_rename.h \
java_semvalue.c \
- java_semvalue.h \
- $(TREECC_SRCOUT)
+ java_semvalue.h
+nodist_libILJava_a_SOURCES = $(TREECC_SRCOUT)
AM_YFLAGS = -d
@@ -37,12 +57,24 @@
STAMP = stamp-treecc
-BUILT_SOURCES = $(STAMP)
+BUILT_SOURCES = $(STAMP) $(TREECC_OUTPUT)
libILJava_a_DEPENDENCIES = $(STAMP)
-$(STAMP): $(TREECC_INPUTS) ../../codegen/$(STAMP)
- $(TREECC) $(srcdir)/java_defs.tc && touch $@
+# Hack alert: if we build out of tree, copy sources to here,
+# because treecc has no option to define the output directory
+
+$(STAMP): $(TREECC_INPUTS) $(top_builddir)/codegen/$(STAMP)
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ cp -f $(srcdir)/*.tc .; \
+ fi; \
+ codegen_tc=`cd $(top_srcdir)/codegen && find . -name "*.tc"`; \
+ for i in $$codegen_tc; do cp $(top_srcdir)/codegen/$$i .; done; \
+ $(TREECC) java_defs.tc && touch $@; \
+ rm -f $$codegen_tc; \
+ if [ "`cd $(srcdir) && pwd`" != "`pwd`" ]; then \
+ rm -f *.tc; \
+ fi
java_scanner.l: java_grammar.c
Index: cscc/java/java_defs.tc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/cscc/java/java_defs.tc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cscc/java/java_defs.tc 21 May 2003 10:40:19 -0000 1.2
+++ cscc/java/java_defs.tc 6 Feb 2007 20:54:52 -0000 1.3
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-%include %readonly "../../codegen/cg_all.tc"
+%include %readonly "cg_all.tc"
/*
* Set a new header for definitions that follow.
Index: csdoc/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/csdoc/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- csdoc/Makefile.am 18 Jun 2004 12:38:56 -0000 1.18
+++ csdoc/Makefile.am 6 Feb 2007 20:54:53 -0000 1.19
@@ -6,7 +6,9 @@
CSDOC_COMMON = doc_destroy.c \
doc_load.c \
doc_main.c \
- doc_sort.c
+ doc_sort.c \
+ doc_tree.h \
+ doc_backend.h
CSDOC_LIBS = ../dumpasm/libILDumpAsm.a ../image/libILImage.a \
../support/libILSupport.a $(GCLIBS)
@@ -29,7 +31,7 @@
csdoc2test_SOURCES = doc_test.c $(CSDOC_COMMON)
csdoc2test_LDADD = $(CSDOC_LIBS)
-cssrc2html_SOURCES = cssrc2html.c fontcolors.c scanner.c
+cssrc2html_SOURCES = cssrc2html.c fontcolors.c scanner.c cssrc2html.h
fontcolors.h tokens.h scanner.h
il2doc_SOURCES = il2doc.c
il2doc_LDADD = $(CSDOC_LIBS)
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/doc/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/Makefile.am 9 Apr 2002 03:51:30 -0000 1.4
+++ doc/Makefile.am 6 Feb 2007 20:54:53 -0000 1.5
@@ -1,7 +1,10 @@
info_TEXINFOS = pnettools.texi
pnettools_TEXINFOS = pnetasm.texi
CLEANFILES = pnettools.info pnettools.info-1 pnettools.info-2 \
- pnettools.info-3 pnettools.info-4
+ pnettools.info-3 pnettools.info-4 \
+ cvmdoc/cvm.xml cvmdoc/index.html
+
+EXTRA_DIST = cvmdoc.py mkcvmdoc.sh
all-local: cvmdoc/index.html
Index: doc/mkcvmdoc.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/doc/mkcvmdoc.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/mkcvmdoc.sh 10 Apr 2002 04:56:16 -0000 1.3
+++ doc/mkcvmdoc.sh 6 Feb 2007 20:54:53 -0000 1.4
@@ -31,15 +31,15 @@
top_builddir="$2"
# Make the output directory.
-if test ! -d "$top_srcdir/doc/cvmdoc" ; then
- mkdir "$top_srcdir/doc/cvmdoc"
+if test ! -d "$top_builddir/doc/cvmdoc" ; then
+ mkdir "$top_builddir/doc/cvmdoc"
fi
# Create the "cvm.xml" file from the interpreter sources.
-if "$top_builddir/csdoc/src2xml" "$top_srcdir"/engine/cvm*.c
>"$top_srcdir/doc/cvmdoc/cvm.xml" ; then
+if "$top_builddir/csdoc/src2xml" "$top_srcdir"/engine/cvm*.c
>"$top_builddir/doc/cvmdoc/cvm.xml" ; then
:
else
- rm -f "$top_srcdir/doc/cvmdoc/cvm.xml"
+ rm -f "$top_builddir/doc/cvmdoc/cvm.xml"
echo "$0: src2xml failed"
exit 1
fi
@@ -48,10 +48,10 @@
# Python is not present or it doesn't have sufficient modules
# to process the XML input. We continue in this case so that
# the main documentation build can complete.
-if python "$top_srcdir/doc/cvmdoc.py" "$top_srcdir/doc/cvmdoc"
"$top_srcdir/engine/cvm.h" <"$top_srcdir/doc/cvmdoc/cvm.xml"; then
+if python "$top_srcdir/doc/cvmdoc.py" "$top_srcdir/doc/cvmdoc"
"$top_srcdir/engine/cvm.h" <"$top_builddir/doc/cvmdoc/cvm.xml"; then
:
else
- touch "$top_srcdir/doc/cvmdoc/index.html"
+ touch "$top_builddir/doc/cvmdoc/index.html"
echo "$0: cvmdoc.py failed - dummy CVM documentation generated"
echo "$0: this error is not serious and can be safely ignored"
exit 0
Index: engine/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/Makefile.am,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- engine/Makefile.am 16 Jan 2007 06:46:08 -0000 1.93
+++ engine/Makefile.am 6 Feb 2007 20:54:53 -0000 1.94
@@ -100,11 +100,11 @@
cvm_lengths.c \
cvmc.c \
debugger.c \
+ debugger.h \
dumpconfig.c \
engine.c \
engine.h \
engine_private.h \
- gen_marshal.c \
heap.c \
int_proto.h \
internal.c \
Index: ilasm/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/ilasm/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ilasm/Makefile.am 21 Aug 2005 15:33:24 -0000 1.13
+++ ilasm/Makefile.am 6 Feb 2007 20:54:53 -0000 1.14
@@ -27,6 +27,7 @@
install-data-local:
rm -f $(DESTDIR)$(man1dir)/al.1.gz
+ $(mkdir_p) $(DESTDIR)$(man1dir)
$(LN_S) ilasm.1.gz $(DESTDIR)$(man1dir)/al.1.gz
uninstall-local:
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/include/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- include/Makefile.am 8 Nov 2003 05:49:46 -0000 1.16
+++ include/Makefile.am 6 Feb 2007 20:54:53 -0000 1.17
@@ -6,6 +6,7 @@
il_console.h \
il_crypt.h \
il_debug.h \
+ il_debugger.h \
il_decimal.h \
il_dumpasm.h \
il_engine.h \
Index: resgen/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/resgen/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- resgen/Makefile.am 18 Jun 2004 12:39:56 -0000 1.5
+++ resgen/Makefile.am 6 Feb 2007 20:54:53 -0000 1.6
@@ -3,6 +3,7 @@
EXTRA_DIST = $(man_MANS)
resgen_SOURCES = resgen.c \
+ resgen.h \
resgen_binary.c \
resgen_po.c \
resgen_text.c \
Index: samples/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/samples/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- samples/Makefile.am 8 Dec 2002 04:35:37 -0000 1.13
+++ samples/Makefile.am 6 Feb 2007 20:54:53 -0000 1.14
@@ -2,10 +2,12 @@
noinst_DATA = evenodd.exe hello.exe
+EXTRA_DIST = evenodd.il hello.il
+
evenodd.exe: evenodd.il
- ../ilasm/ilasm -o evenodd.exe $(srcdir)/evenodd.il
+ $(ILASM) -o evenodd.exe $(srcdir)/evenodd.il
hello.exe: hello.il
- ../ilasm/ilasm -o hello.exe $(srcdir)/hello.il
+ $(ILASM) -o hello.exe $(srcdir)/hello.il
CLEANFILES = $(noinst_DATA)
Index: tests/Makefile.am
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/tests/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- tests/Makefile.am 18 Jun 2004 12:39:58 -0000 1.19
+++ tests/Makefile.am 6 Feb 2007 20:54:53 -0000 1.20
@@ -1,7 +1,8 @@
noinst_PROGRAMS = test_thread test_crypt
test_thread_SOURCES = test_thread.c \
- ilunit.c
+ ilunit.c \
+ ilunit.h
test_thread_LDADD = ../image/libILImage.a ../support/libILSupport.a \
$(GCLIBS)
Index: libffi/configure
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libffi/configure 17 Aug 2005 19:27:00 -0000 1.10
+++ libffi/configure 6 Feb 2007 20:54:53 -0000 1.11
@@ -1353,9 +1353,9 @@
if test "$srcdir" = "."; then
if test "$with_target_subdir" != "."; then
- multi_basedir="$srcdir/$with_multisrctop../.."
+ multi_basedir="$srcdir/$with_multisrctop../"
else
- multi_basedir="$srcdir/$with_multisrctop.."
+ multi_basedir="$srcdir/$with_multisrctop"
fi
else
multi_basedir="$srcdir/.."
@@ -8370,7 +8370,6 @@
"include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
"include/ffi.h" ) CONFIG_FILES="$CONFIG_FILES include/ffi.h" ;;
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "testsuite/Makefile" ) CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
"include/ffitarget.h" ) CONFIG_LINKS="$CONFIG_LINKS
include/ffitarget.h:src/$TARGETDIR/ffitarget.h" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
Index: libffi/configure.ac
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libffi/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libffi/configure.ac 17 Aug 2005 19:27:00 -0000 1.2
+++ libffi/configure.ac 6 Feb 2007 20:54:53 -0000 1.3
@@ -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}
@@ -283,6 +283,6 @@
AC_CONFIG_LINKS(include/ffitarget.h:src/$TARGETDIR/ffitarget.h)
-AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile testsuite/Makefile)
+AC_CONFIG_FILES(include/Makefile include/ffi.h Makefile)
AC_OUTPUT
Index: profiles/Makefile.am
===================================================================
RCS file: profiles/Makefile.am
diff -N profiles/Makefile.am
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ profiles/Makefile.am 6 Feb 2007 20:54:53 -0000 1.1
@@ -0,0 +1,10 @@
+EXTRA_DIST = README \
+ compact \
+ compact-fp \
+ full \
+ full-tl \
+ kernel \
+ kernel-fp \
+ mkprofile.sh \
+ tiny
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] pnet ChangeLog Makefile.am auto_gen.sh configur...,
Klaus Treichel <=