PatchSet 7675
Date: 2008/01/06 19:41:25
Author: robilad
Branch: HEAD
Tag: (none)
Log:
removed unnecessary noinst_HEADERS
2008-01-06 Dalibor Topic <[EMAIL PROTECTED]>
* kaffe/kaffevm/Makefile.am (noinst_HEADERS): Removed. Moved
headers over to libkaffe_la_SOURCES.
* kaffe/kaffeh/Makefile.am (noinst_HEADERS) Removed. Moved
headers over to kaffeh_SOURCES.
Members:
ChangeLog:1.5177->1.5178
kaffe/kaffeh/Makefile.am:1.30->1.31
kaffe/kaffeh/Makefile.in:1.205->1.206
kaffe/kaffevm/Makefile.am:1.105->1.106
kaffe/kaffevm/Makefile.in:1.275->1.276
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5177 kaffe/ChangeLog:1.5178
--- kaffe/ChangeLog:1.5177 Sun Jan 6 19:07:07 2008
+++ kaffe/ChangeLog Sun Jan 6 19:41:25 2008
@@ -1,5 +1,13 @@
2008-01-06 Dalibor Topic <[EMAIL PROTECTED]>
+ * kaffe/kaffevm/Makefile.am (noinst_HEADERS): Removed. Moved
+ headers over to libkaffe_la_SOURCES.
+
+ * kaffe/kaffeh/Makefile.am (noinst_HEADERS) Removed. Moved
+ headers over to kaffeh_SOURCES.
+
+2008-01-06 Dalibor Topic <[EMAIL PROTECTED]>
+
* TODO, WHATSNEW: Updated to document removal of binreloc.
2008-01-06 Dalibor Topic <[EMAIL PROTECTED]>
Index: kaffe/kaffe/kaffeh/Makefile.am
diff -u kaffe/kaffe/kaffeh/Makefile.am:1.30 kaffe/kaffe/kaffeh/Makefile.am:1.31
--- kaffe/kaffe/kaffeh/Makefile.am:1.30 Sun Jan 6 19:05:19 2008
+++ kaffe/kaffe/kaffeh/Makefile.am Sun Jan 6 19:41:27 2008
@@ -30,7 +30,11 @@
main.c \
mem.c \
sigs.c \
- support.c
+ support.c \
+ kaffeh-support.h \
+ java_lang_ClassLoader.h \
+ java_lang_Object.h \
+ java_lang_String.h
nodist_kaffeh_SOURCES = \
constants.c \
@@ -39,10 +43,3 @@
jar.c \
readClass.c \
utf8const.c
-
-
-noinst_HEADERS = \
- kaffeh-support.h \
- java_lang_ClassLoader.h \
- java_lang_Object.h \
- java_lang_String.h
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.205
kaffe/kaffe/kaffeh/Makefile.in:1.206
--- kaffe/kaffe/kaffeh/Makefile.in:1.205 Sun Jan 6 19:05:20 2008
+++ kaffe/kaffe/kaffeh/Makefile.in Sun Jan 6 19:41:27 2008
@@ -22,7 +22,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +42,7 @@
host_triplet = @host@
bin_PROGRAMS = kaffeh$(EXEEXT)
subdir = kaffe/kaffeh
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \
@@ -96,7 +94,6 @@
$(LDFLAGS) -o $@
SOURCES = $(kaffeh_SOURCES) $(nodist_kaffeh_SOURCES)
DIST_SOURCES = $(kaffeh_SOURCES)
-HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -323,7 +320,11 @@
main.c \
mem.c \
sigs.c \
- support.c
+ support.c \
+ kaffeh-support.h \
+ java_lang_ClassLoader.h \
+ java_lang_Object.h \
+ java_lang_String.h
nodist_kaffeh_SOURCES = \
constants.c \
@@ -333,12 +334,6 @@
readClass.c \
utf8const.c
-noinst_HEADERS = \
- kaffeh-support.h \
- java_lang_ClassLoader.h \
- java_lang_Object.h \
- java_lang_String.h
-
all: all-am
.SUFFIXES:
@@ -524,7 +519,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(PROGRAMS) $(HEADERS)
+all-am: Makefile $(PROGRAMS)
installdirs:
for dir in "$(DESTDIR)$(bindir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.105
kaffe/kaffe/kaffevm/Makefile.am:1.106
--- kaffe/kaffe/kaffevm/Makefile.am:1.105 Sun Jan 6 19:05:20 2008
+++ kaffe/kaffe/kaffevm/Makefile.am Sun Jan 6 19:41:28 2008
@@ -131,27 +131,7 @@
utf8const.c \
gcFuncs.c \
reflect.c \
- reference.c
-
-libkaffevm_la_SOURCES = \
- $(top_srcdir)/libraries/clib/native/AccessController.c \
- $(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
- $(top_srcdir)/libraries/clib/native/Constructor.c \
- $(top_srcdir)/libraries/clib/native/Field.c \
- $(top_srcdir)/libraries/clib/native/Method.c \
- $(top_srcdir)/libraries/clib/native/Class.c \
- $(top_srcdir)/libraries/clib/native/ClassLoader.c \
- $(top_srcdir)/libraries/clib/native/java_lang_Object.c \
- $(top_srcdir)/libraries/clib/native/Runtime.c \
- $(top_srcdir)/libraries/clib/native/VMRuntime.c \
- $(top_srcdir)/libraries/clib/native/java_lang_String.c \
- $(top_srcdir)/libraries/clib/native/System.c \
- $(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
- $(top_srcdir)/libraries/clib/native/Throwable.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
-
-noinst_HEADERS = \
+ reference.c \
access.h \
baseClasses.h \
bytecode.h \
@@ -187,6 +167,24 @@
utf8const.h \
reflect.h \
reference.h
+
+libkaffevm_la_SOURCES = \
+ $(top_srcdir)/libraries/clib/native/AccessController.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
+ $(top_srcdir)/libraries/clib/native/Constructor.c \
+ $(top_srcdir)/libraries/clib/native/Field.c \
+ $(top_srcdir)/libraries/clib/native/Method.c \
+ $(top_srcdir)/libraries/clib/native/Class.c \
+ $(top_srcdir)/libraries/clib/native/ClassLoader.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_Object.c \
+ $(top_srcdir)/libraries/clib/native/Runtime.c \
+ $(top_srcdir)/libraries/clib/native/VMRuntime.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_String.c \
+ $(top_srcdir)/libraries/clib/native/System.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
+ $(top_srcdir)/libraries/clib/native/Throwable.c \
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
CLEANFILES = so_locations
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.275
kaffe/kaffe/kaffevm/Makefile.in:1.276
--- kaffe/kaffe/kaffevm/Makefile.in:1.275 Sun Jan 6 19:05:20 2008
+++ kaffe/kaffe/kaffevm/Makefile.in Sun Jan 6 19:41:28 2008
@@ -25,7 +25,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -45,10 +44,9 @@
build_triplet = @build@
host_triplet = @host@
subdir = kaffe/kaffevm
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/constants.c $(srcdir)/debug.c \
- $(srcdir)/file.c $(srcdir)/jar.c $(srcdir)/readClass.c \
- $(srcdir)/utf8const.c
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/constants.c $(srcdir)/debug.c $(srcdir)/file.c \
+ $(srcdir)/jar.c $(srcdir)/readClass.c $(srcdir)/utf8const.c
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \
$(top_srcdir)/m4/ac_prog_javac.m4 \
@@ -148,7 +146,6 @@
install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive
-HEADERS = $(noinst_HEADERS)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
ETAGS = etags
@@ -465,27 +462,7 @@
utf8const.c \
gcFuncs.c \
reflect.c \
- reference.c
-
-libkaffevm_la_SOURCES = \
- $(top_srcdir)/libraries/clib/native/AccessController.c \
- $(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
- $(top_srcdir)/libraries/clib/native/Constructor.c \
- $(top_srcdir)/libraries/clib/native/Field.c \
- $(top_srcdir)/libraries/clib/native/Method.c \
- $(top_srcdir)/libraries/clib/native/Class.c \
- $(top_srcdir)/libraries/clib/native/ClassLoader.c \
- $(top_srcdir)/libraries/clib/native/java_lang_Object.c \
- $(top_srcdir)/libraries/clib/native/Runtime.c \
- $(top_srcdir)/libraries/clib/native/VMRuntime.c \
- $(top_srcdir)/libraries/clib/native/java_lang_String.c \
- $(top_srcdir)/libraries/clib/native/System.c \
- $(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
- $(top_srcdir)/libraries/clib/native/Throwable.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
- $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
-
-noinst_HEADERS = \
+ reference.c \
access.h \
baseClasses.h \
bytecode.h \
@@ -522,6 +499,24 @@
reflect.h \
reference.h
+libkaffevm_la_SOURCES = \
+ $(top_srcdir)/libraries/clib/native/AccessController.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_ref_Reference.c \
+ $(top_srcdir)/libraries/clib/native/Constructor.c \
+ $(top_srcdir)/libraries/clib/native/Field.c \
+ $(top_srcdir)/libraries/clib/native/Method.c \
+ $(top_srcdir)/libraries/clib/native/Class.c \
+ $(top_srcdir)/libraries/clib/native/ClassLoader.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_Object.c \
+ $(top_srcdir)/libraries/clib/native/Runtime.c \
+ $(top_srcdir)/libraries/clib/native/VMRuntime.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_String.c \
+ $(top_srcdir)/libraries/clib/native/System.c \
+ $(top_srcdir)/libraries/clib/native/java_lang_Thread.c \
+ $(top_srcdir)/libraries/clib/native/Throwable.c \
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMStackWalker.c \
+ $(top_srcdir)/libraries/clib/native/gnu_classpath_VMSystemProperties.c
+
CLEANFILES = so_locations
all: all-recursive
@@ -1198,7 +1193,7 @@
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(LTLIBRARIES)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(nativedir)"; do \
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
