[kaffe] CVS kaffe (dalibor): Fixed libtool problems with sound libraries

Sun Sep 21 12:31:02 PDT 2003

PatchSet 4052 
Date: 2003/09/21 19:28:37
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed libtool problems with sound libraries

Members: 
	libraries/extensions/sound/alsa/Makefile.am:1.3->1.4 
	libraries/extensions/sound/alsa/Makefile.in:1.23->1.24 
	libraries/extensions/sound/alsa/common.c:INITIAL->1.1 
	libraries/extensions/sound/common/Makefile.am:1.3->1.4 
	libraries/extensions/sound/common/Makefile.in:1.22->1.23 
	libraries/extensions/sound/esd/Makefile.am:1.5->1.6 
	libraries/extensions/sound/esd/Makefile.in:1.23->1.24 
	libraries/extensions/sound/esd/common.c:INITIAL->1.1 

Index: kaffe/libraries/extensions/sound/alsa/Makefile.am
diff -u kaffe/libraries/extensions/sound/alsa/Makefile.am:1.3 kaffe/libraries/extensions/sound/alsa/Makefile.am:1.4

--- kaffe/libraries/extensions/sound/alsa/Makefile.am:1.3	Thu Jul 31 22:47:04 2003
+++ kaffe/libraries/extensions/sound/alsa/Makefile.am	Sun Sep 21 19:28:37 2003
@@ -1,6 +1,6 @@
 # Alsa files for Tritonus javax.sound implementation
 #
-# Copyright (c) 2002
+# Copyright (c) 2002, 2003
 #	Dalibor Topic <robilad at yahoo.com>
 #
 # See the file "license.terms" for information on usage and redistribution 
@@ -11,8 +11,9 @@
 native_LTLIBRARIES = libtritonusalsa.la
 
 libtritonusalsa_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|org)_"
-libtritonusalsa_la_LIBADD = -lasound  -L../common -ltritonuscommon
+libtritonusalsa_la_LIBADD = -lasound
 libtritonusalsa_la_SOURCES = \
+	common.c \
 	init.c \
 	org_tritonus_lowlevel_alsa_Alsa.c \
 	org_tritonus_lowlevel_alsa_AlsaCtl.c \
Index: kaffe/libraries/extensions/sound/alsa/Makefile.in
diff -u kaffe/libraries/extensions/sound/alsa/Makefile.in:1.23 kaffe/libraries/extensions/sound/alsa/Makefile.in:1.24
--- kaffe/libraries/extensions/sound/alsa/Makefile.in:1.23	Sun Aug 31 22:09:22 2003
+++ kaffe/libraries/extensions/sound/alsa/Makefile.in	Sun Sep 21 19:28:38 2003
@@ -16,7 +16,7 @@
 
 # Alsa files for Tritonus javax.sound implementation
 #
-# Copyright (c) 2002
+# Copyright (c) 2002, 2003
 #	Dalibor Topic <robilad at yahoo.com>
 #
 # See the file "license.terms" for information on usage and redistribution 
@@ -252,8 +252,9 @@
 native_LTLIBRARIES = libtritonusalsa.la
 
 libtritonusalsa_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|org)_"
-libtritonusalsa_la_LIBADD = -lasound  -L../common -ltritonuscommon
+libtritonusalsa_la_LIBADD = -lasound
 libtritonusalsa_la_SOURCES = \
+	common.c \
 	init.c \
 	org_tritonus_lowlevel_alsa_Alsa.c \
 	org_tritonus_lowlevel_alsa_AlsaCtl.c \
@@ -291,7 +292,7 @@
 LTLIBRARIES = $(native_LTLIBRARIES)
 
 libtritonusalsa_la_DEPENDENCIES =
-am_libtritonusalsa_la_OBJECTS = init.lo \
+am_libtritonusalsa_la_OBJECTS = common.lo init.lo \
 	org_tritonus_lowlevel_alsa_Alsa.lo \
 	org_tritonus_lowlevel_alsa_AlsaCtl.lo \
 	org_tritonus_lowlevel_alsa_AlsaCtlCardInfo.lo \
@@ -316,7 +317,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/init.Plo \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/common.Plo ./$(DEPDIR)/init.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/org_tritonus_lowlevel_alsa_Alsa.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/org_tritonus_lowlevel_alsa_AlsaCtl.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/org_tritonus_lowlevel_alsa_AlsaCtlCardInfo.Plo \
@@ -394,6 +395,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/init.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/org_tritonus_lowlevel_alsa_Alsa.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/org_tritonus_lowlevel_alsa_AlsaCtl.Plo at am__quote@
===================================================================
Checking out kaffe/libraries/extensions/sound/alsa/common.c
RCS:  /home/cvs/kaffe/kaffe/libraries/extensions/sound/alsa/common.c,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/extensions/sound/alsa/common.c	Sun Sep 21 19:30:50 2003
@@ -0,0 +1,5 @@
+/* Just includes ../common/common.c in order to
+ * deal with libtool's inability to link to shared
+ * libraries.
+ */
+#include "../common/common.c"
Index: kaffe/libraries/extensions/sound/common/Makefile.am
diff -u kaffe/libraries/extensions/sound/common/Makefile.am:1.3 kaffe/libraries/extensions/sound/common/Makefile.am:1.4
--- kaffe/libraries/extensions/sound/common/Makefile.am:1.3	Thu Jul 31 22:47:05 2003
+++ kaffe/libraries/extensions/sound/common/Makefile.am	Sun Sep 21 19:28:38 2003
@@ -1,6 +1,6 @@
 # Common files for Tritonus javax.sound implementation
 #
-# Copyright (c) 2002
+# Copyright (c) 2002, 2003
 #	Dalibor Topic <robilad at yahoo.com>
 #
 # See the file "license.terms" for information on usage and redistribution 
@@ -8,14 +8,10 @@
 
 AM_CPPFLAGS = -I$(top_builddir)/include
 
-native_LTLIBRARIES = libtritonuscommon.la
-
-libtritonuscommon_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|kaffe|org)_"
-libtritonuscommon_la_SOURCES = common.c
+noinst_SOURCES = \
+	common.c
 
 noinst_HEADERS = \
 	common.h \
 	debug.h \
 	HandleFieldHandler.h
-
-CLEANFILES = so_locations
Index: kaffe/libraries/extensions/sound/common/Makefile.in
diff -u kaffe/libraries/extensions/sound/common/Makefile.in:1.22 kaffe/libraries/extensions/sound/common/Makefile.in:1.23
--- kaffe/libraries/extensions/sound/common/Makefile.in:1.22	Sun Aug 31 22:09:22 2003
+++ kaffe/libraries/extensions/sound/common/Makefile.in	Sun Sep 21 19:28:38 2003
@@ -16,7 +16,7 @@
 
 # Common files for Tritonus javax.sound implementation
 #
-# Copyright (c) 2002
+# Copyright (c) 2002, 2003
 #	Dalibor Topic <robilad at yahoo.com>
 #
 # See the file "license.terms" for information on usage and redistribution 
@@ -249,129 +249,33 @@
 
 AM_CPPFLAGS = -I$(top_builddir)/include
 
-native_LTLIBRARIES = libtritonuscommon.la
+noinst_SOURCES = \
+	common.c
 
-libtritonuscommon_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|kaffe|org)_"
-libtritonuscommon_la_SOURCES = common.c
 
 noinst_HEADERS = \
 	common.h \
 	debug.h \
 	HandleFieldHandler.h
 
-
-CLEANFILES = so_locations
 subdir = libraries/extensions/sound/common
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h \
 	$(top_builddir)/include/kaffe/jtypes.h
 CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(native_LTLIBRARIES)
-
-libtritonuscommon_la_LIBADD =
-am_libtritonuscommon_la_OBJECTS = common.lo
-libtritonuscommon_la_OBJECTS = $(am_libtritonuscommon_la_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/common.Plo
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libtritonuscommon_la_SOURCES)
+DIST_SOURCES =
 HEADERS = $(noinst_HEADERS)
 
 DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
-SOURCES = $(libtritonuscommon_la_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --gnu  libraries/extensions/sound/common/Makefile
 Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-nativeLTLIBRARIES_INSTALL = $(INSTALL)
-install-nativeLTLIBRARIES: $(native_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(nativedir)
-	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-	    echo " $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(nativedir)/$$f"; \
-	    $(LIBTOOL) --mode=install $(nativeLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(nativedir)/$$f; \
-	  else :; fi; \
-	done
-
-uninstall-nativeLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
-	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(nativedir)/$$p"; \
-	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(nativedir)/$$p; \
-	done
-
-clean-nativeLTLIBRARIES:
-	-test -z "$(native_LTLIBRARIES)" || rm -f $(native_LTLIBRARIES)
-	@list='$(native_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" = "$$p" && dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libtritonuscommon.la: $(libtritonuscommon_la_OBJECTS) $(libtritonuscommon_la_DEPENDENCIES) 
-	$(LINK) -rpath $(nativedir) $(libtritonuscommon_la_LDFLAGS) $(libtritonuscommon_la_OBJECTS) $(libtritonuscommon_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
-
-distclean-compile:
-	-rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common.Plo at am__quote@
-
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
-.c.o:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@	fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-
-.c.obj:
- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@	fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
-
-.c.lo:
- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
- at am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
- at am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
- at am__fastdepCC_TRUE@	fi
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -470,10 +374,9 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+all-am: Makefile $(HEADERS)
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(nativedir)
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -491,7 +394,6 @@
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f Makefile $(CONFIG_CLEAN_FILES)
@@ -501,13 +403,12 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-nativeLTLIBRARIES \
-	mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
+distclean-am: clean-am distclean-generic distclean-libtool \
+	distclean-tags
 
 dvi: dvi-am
 
@@ -517,7 +418,7 @@
 
 info-am:
 
-install-data-am: install-nativeLTLIBRARIES
+install-data-am:
 
 install-exec-am:
 
@@ -533,8 +434,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -544,20 +444,17 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nativeLTLIBRARIES
+uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-nativeLTLIBRARIES ctags distclean \
-	distclean-compile distclean-depend distclean-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-nativeLTLIBRARIES install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am \
-	uninstall-nativeLTLIBRARIES
+	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
 
 # 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.
Index: kaffe/libraries/extensions/sound/esd/Makefile.am
diff -u kaffe/libraries/extensions/sound/esd/Makefile.am:1.5 kaffe/libraries/extensions/sound/esd/Makefile.am:1.6
--- kaffe/libraries/extensions/sound/esd/Makefile.am:1.5	Thu Jul 31 22:47:06 2003
+++ kaffe/libraries/extensions/sound/esd/Makefile.am	Sun Sep 21 19:28:39 2003
@@ -10,11 +10,20 @@
 
 native_LTLIBRARIES = libtritonusesd.la
 
-libtritonusesd_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|org)_"
-libtritonusesd_la_LIBADD = -lesd -L../common -ltritonuscommon
+libtritonusesd_la_LDFLAGS =\
+	$(KLIBFLAGS) \
+	-module \
+	-release $(KVER) \
+	-export-symbols-regex "^([Jj]ava|org)_"
+
+libtritonusesd_la_LIBADD = -lesd
 libtritonusesd_la_SOURCES = \
-	common.h \
+	common.c \
 	org_tritonus_lowlevel_esd_EsdRecordingStream.c \
 	org_tritonus_lowlevel_esd_EsdStream.c
+
+
+noinst_HEADERS = \
+	common.h 
 
 CLEANFILES = so_locations
Index: kaffe/libraries/extensions/sound/esd/Makefile.in
diff -u kaffe/libraries/extensions/sound/esd/Makefile.in:1.23 kaffe/libraries/extensions/sound/esd/Makefile.in:1.24
--- kaffe/libraries/extensions/sound/esd/Makefile.in:1.23	Sun Aug 31 22:09:23 2003
+++ kaffe/libraries/extensions/sound/esd/Makefile.in	Sun Sep 21 19:28:39 2003
@@ -251,14 +251,24 @@
 
 native_LTLIBRARIES = libtritonusesd.la
 
-libtritonusesd_la_LDFLAGS = $(KLIBFLAGS) -module -release $(KVER) -export-symbols-regex "^([Jj]ava|org)_"
-libtritonusesd_la_LIBADD = -lesd -L../common -ltritonuscommon
+libtritonusesd_la_LDFLAGS = \
+	$(KLIBFLAGS) \
+	-module \
+	-release $(KVER) \
+	-export-symbols-regex "^([Jj]ava|org)_"
+
+
+libtritonusesd_la_LIBADD = -lesd
 libtritonusesd_la_SOURCES = \
-	common.h \
+	common.c \
 	org_tritonus_lowlevel_esd_EsdRecordingStream.c \
 	org_tritonus_lowlevel_esd_EsdStream.c
 
 
+noinst_HEADERS = \
+	common.h 
+
+
 CLEANFILES = so_locations
 subdir = libraries/extensions/sound/esd
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -269,7 +279,7 @@
 LTLIBRARIES = $(native_LTLIBRARIES)
 
 libtritonusesd_la_DEPENDENCIES =
-am_libtritonusesd_la_OBJECTS = \
+am_libtritonusesd_la_OBJECTS = common.lo \
 	org_tritonus_lowlevel_esd_EsdRecordingStream.lo \
 	org_tritonus_lowlevel_esd_EsdStream.lo
 libtritonusesd_la_OBJECTS = $(am_libtritonusesd_la_OBJECTS)
@@ -277,7 +287,7 @@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/config -I$(top_builddir)/include/kaffe
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/common.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/org_tritonus_lowlevel_esd_EsdRecordingStream.Plo \
 @AMDEP_TRUE@	./$(DEPDIR)/org_tritonus_lowlevel_esd_EsdStream.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -287,7 +297,9 @@
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 DIST_SOURCES = $(libtritonusesd_la_SOURCES)
-DIST_COMMON = Makefile.am Makefile.in
+HEADERS = $(noinst_HEADERS)
+
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
 SOURCES = $(libtritonusesd_la_SOURCES)
 
 all: all-am
@@ -336,6 +348,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/org_tritonus_lowlevel_esd_EsdRecordingStream.Plo at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/org_tritonus_lowlevel_esd_EsdStream.Plo at am__quote@
 
@@ -472,7 +485,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LTLIBRARIES)
+all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(nativedir)
===================================================================
Checking out kaffe/libraries/extensions/sound/esd/common.c
RCS:  /home/cvs/kaffe/kaffe/libraries/extensions/sound/esd/common.c,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/libraries/extensions/sound/esd/common.c	Sun Sep 21 19:30:50 2003
@@ -0,0 +1,5 @@
+/* Just includes ../common/common.c in order to
+ * deal with libtool's inability to link to shared
+ * libraries.
+ */
+#include "../common/common.c"


