PatchSet 4054
Date: 2003/09/22 14:29:16
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Fix for make dist and libtool warning
My last Makefile.am changes broke make dist. Fixed now. Also thrown in
is a fix for a libtool warning on freebsd 4.8
Members:
ChangeLog:1.1649->1.1650
Makefile.am:1.47->1.48
Makefile.in:1.113->1.114
developers/autogen.sh:1.15->1.16
developers/patch-libtool-ltdl-memory-header-warning.diff:INITIAL->1.1
libltdl/ltdl.c:1.35->1.36
libraries/extensions/sound/common/Makefile.am:1.4->1.5
libraries/extensions/sound/common/Makefile.in:1.23->1.24
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1649 kaffe/ChangeLog:1.1650
--- kaffe/ChangeLog:1.1649 Mon Sep 22 12:26:34 2003
+++ kaffe/ChangeLog Mon Sep 22 14:29:16 2003
@@ -1,3 +1,31 @@
+2003-09-22 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * developers/patch-libtool-ltdl-memory-header-warning.diff:
+ New file.
+
+ * Makefile.am:
+ (EXTRA_DIST) Added
+ developers/patch-libtool-ltdl-memory-header-warning.diff.
+
+ * Makefile.in:
+ Regenerated.
+
+ * developers/autogen.sh:
+ Updated to apply
+ developers/patch-libtool-ltdl-memory-header-warning.diff.
+
+ * libltdl/ltdl.c:
+ Regenerated.
+
+ * libraries/extensions/sound/common/Makefile.am:
+ (AM_CPPFLAGS, noinst_SOURCES, noinst_HEADERS) Removed, since no
+ sources are being built, thus Automake left the files out of the
+ distribution.
+ (EXTRA_DIST) Put the sources in here.
+
+ * libraries/extensions/sound/common/Makefile.in:
+ Regenerated.
+
2003-09-21 Dalibor Topic <[EMAIL PROTECTED]>
Fix for libtool problems with sound libraries.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.47 kaffe/Makefile.am:1.48
--- kaffe/Makefile.am:1.47 Sun Aug 31 22:08:52 2003
+++ kaffe/Makefile.am Mon Sep 22 14:29:17 2003
@@ -111,6 +111,7 @@
developers/patch-libtool-openbsd.diff \
developers/patch-libtool-realloc.diff \
developers/patch-libtool-amiga-max-command-line-length.diff \
+ developers/patch-libtool-ltdl-memory-header-warning.diff \
developers/rpm-kaffe.spec \
developers/sp_offset.c \
developers/unicode.pl \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.113 kaffe/Makefile.in:1.114
--- kaffe/Makefile.in:1.113 Sun Aug 31 22:08:52 2003
+++ kaffe/Makefile.in Mon Sep 22 14:29:17 2003
@@ -352,6 +352,7 @@
developers/patch-libtool-openbsd.diff \
developers/patch-libtool-realloc.diff \
developers/patch-libtool-amiga-max-command-line-length.diff \
+ developers/patch-libtool-ltdl-memory-header-warning.diff \
developers/rpm-kaffe.spec \
developers/sp_offset.c \
developers/unicode.pl \
Index: kaffe/developers/autogen.sh
diff -u kaffe/developers/autogen.sh:1.15 kaffe/developers/autogen.sh:1.16
--- kaffe/developers/autogen.sh:1.15 Wed Jul 30 22:49:47 2003
+++ kaffe/developers/autogen.sh Mon Sep 22 14:29:18 2003
@@ -105,6 +105,7 @@
patch -p0 < developers/patch-libtool-openbsd.diff
patch -p0 < developers/patch-libtool-realloc.diff
patch -p0 < developers/patch-libtool-amiga-max-command-line-length.diff
+patch -p0 < developers/patch-libtool-ltdl-memory-header-warning.diff
cp libltdl/acinclude.m4 libtool.m4
aclocal -I .
===================================================================
Checking out kaffe/developers/patch-libtool-ltdl-memory-header-warning.diff
RCS: /home/cvs/kaffe/kaffe/developers/patch-libtool-ltdl-memory-header-warning.diff,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/developers/patch-libtool-ltdl-memory-header-warning.diff Mon Sep 22
14:45:24 2003
@@ -0,0 +1,37 @@
+More info on this patch:
+
+ http://mail.gnu.org/archive/html/libtool/2003-09/msg00060.html
+ http://mail.gnu.org/archive/html/libtool/2003-09/msg00065.html
+
+This patch has been sent for merge upstream in libtool.
+
+
+Index: libltdl/ltdl.c
+===================================================================
+RCS file: /cvs/kaffe/kaffe/libltdl/ltdl.c,v
+retrieving revision 1.35
+diff -u -r1.35 ltdl.c
+--- libltdl/ltdl.c 4 Jun 2003 16:03:50 -0000 1.35
++++ libltdl/ltdl.c 22 Sep 2003 13:33:23 -0000
+@@ -39,6 +39,10 @@
+
+ #if HAVE_STDLIB_H
+ # include <stdlib.h>
++#else
++# if HAVE_MALLOC_H
++# include <malloc.h>
++# endif
+ #endif
+
+ #if HAVE_STRING_H
+@@ -51,10 +55,6 @@
+
+ #if HAVE_CTYPE_H
+ # include <ctype.h>
+-#endif
+-
+-#if HAVE_MALLOC_H
+-# include <malloc.h>
+ #endif
+
+ #if HAVE_MEMORY_H
Index: kaffe/libltdl/ltdl.c
diff -u kaffe/libltdl/ltdl.c:1.35 kaffe/libltdl/ltdl.c:1.36
--- kaffe/libltdl/ltdl.c:1.35 Wed Jun 4 16:03:50 2003
+++ kaffe/libltdl/ltdl.c Mon Sep 22 14:29:19 2003
@@ -39,6 +39,10 @@
#if HAVE_STDLIB_H
# include <stdlib.h>
+#else
+# if HAVE_MALLOC_H
+# include <malloc.h>
+# endif
#endif
#if HAVE_STRING_H
@@ -51,10 +55,6 @@
#if HAVE_CTYPE_H
# include <ctype.h>
-#endif
-
-#if HAVE_MALLOC_H
-# include <malloc.h>
#endif
#if HAVE_MEMORY_H
Index: kaffe/libraries/extensions/sound/common/Makefile.am
diff -u kaffe/libraries/extensions/sound/common/Makefile.am:1.4
kaffe/libraries/extensions/sound/common/Makefile.am:1.5
--- kaffe/libraries/extensions/sound/common/Makefile.am:1.4 Sun Sep 21 19:28:38
2003
+++ kaffe/libraries/extensions/sound/common/Makefile.am Mon Sep 22 14:29:19 2003
@@ -6,12 +6,8 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-AM_CPPFLAGS = -I$(top_builddir)/include
-
-noinst_SOURCES = \
- common.c
-
-noinst_HEADERS = \
+EXTRA_DIST = \
+ common.c \
common.h \
debug.h \
HandleFieldHandler.h
Index: kaffe/libraries/extensions/sound/common/Makefile.in
diff -u kaffe/libraries/extensions/sound/common/Makefile.in:1.23
kaffe/libraries/extensions/sound/common/Makefile.in:1.24
--- kaffe/libraries/extensions/sound/common/Makefile.in:1.23 Sun Sep 21 19:28:38
2003
+++ kaffe/libraries/extensions/sound/common/Makefile.in Mon Sep 22 14:29:19 2003
@@ -247,13 +247,8 @@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
-AM_CPPFLAGS = -I$(top_builddir)/include
-
-noinst_SOURCES = \
- common.c
-
-
-noinst_HEADERS = \
+EXTRA_DIST = \
+ common.c \
common.h \
debug.h \
HandleFieldHandler.h
@@ -265,9 +260,7 @@
$(top_builddir)/include/kaffe/jtypes.h
CONFIG_CLEAN_FILES =
DIST_SOURCES =
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+DIST_COMMON = Makefile.am Makefile.in
all: all-am
.SUFFIXES:
@@ -286,60 +279,12 @@
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- mkid -fID $$unique
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$tags$$unique" \
- || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$tags $$unique
+TAGS:
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && cd $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) $$here
+CTAGS:
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ../../../..
@@ -374,7 +319,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(HEADERS)
+all-am: Makefile
installdirs:
install: install-am
@@ -407,8 +352,7 @@
distclean: distclean-am
-distclean-am: clean-am distclean-generic distclean-libtool \
- distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool
dvi: dvi-am
@@ -446,15 +390,15 @@
uninstall-am: uninstall-info-am
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool ctags distclean distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am info \
- info-am install install-am install-data install-data-am \
- install-exec install-exec-am install-info install-info-am \
- install-man install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
- ps ps-am tags uninstall uninstall-am uninstall-info-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
