[cvs-annodex] commit (/annodex): libannodex/trunk/Makefile.am libannodex/trunk/src/libannodex/Makefile.am +libannodex/trunk/libtool.m4 +libannodex/trunk/ltdl.m4

[conrad]

Update of /annodex (new revision 900)

Added files:
   libannodex/trunk/libtool.m4
   libannodex/trunk/ltdl.m4

Modified files:
   libannodex/trunk/Makefile.am
   libannodex/trunk/src/libannodex/Makefile.am

Log Message:
workarounds/fixes for make distcheck:
	+ updated noinst_HEADERS in src/libannodex/Makefile.am
	+ added dummy libtool.m4 and ltdl.m4 files to workaround a bug in ltdl


Modified: libannodex/trunk/Makefile.am
===================================================================
--- libannodex/trunk/Makefile.am	2005-02-14 20:12:47 UTC (rev 899)
+++ libannodex/trunk/Makefile.am	2005-02-14 21:00:09 UTC (rev 900)
@@ -7,6 +7,8 @@
 endif
 
 EXTRA_DIST = annodex.pc.in README.win32 \
+	libtool.m4 \
+	ltdl.m4 \
 	win32/Makefile \
 	win32/config.h \
 	win32/dirent.c \

Added: libannodex/trunk/libtool.m4
===================================================================
--- libannodex/trunk/libtool.m4	2005-02-14 20:12:47 UTC (rev 899)
+++ libannodex/trunk/libtool.m4	2005-02-14 21:00:09 UTC (rev 900)
@@ -0,0 +1,2 @@
+*** This is a placeholder file to workaround a bug in ltdl/Makefile,
+*** originating in the ltdl version shipped with this software.

Added: libannodex/trunk/ltdl.m4
===================================================================
--- libannodex/trunk/ltdl.m4	2005-02-14 20:12:47 UTC (rev 899)
+++ libannodex/trunk/ltdl.m4	2005-02-14 21:00:09 UTC (rev 900)
@@ -0,0 +1,2 @@
+*** This is a placeholder file to workaround a bug in ltdl/Makefile,
+*** originating in the ltdl version shipped with this software.

Modified: libannodex/trunk/src/libannodex/Makefile.am
===================================================================
--- libannodex/trunk/src/libannodex/Makefile.am	2005-02-14 20:12:47 UTC (rev 899)
+++ libannodex/trunk/src/libannodex/Makefile.am	2005-02-14 21:00:09 UTC (rev 900)
@@ -19,27 +19,40 @@
 # Libraries to build
 lib_LTLIBRARIES = libannodex.la
 
+noinst_HEADERS = \
+	anx_byteswap.h \
+	anx_command.h \
+	anx_compat.h \
+	anx_data_packet.h \
+	anx_element.h \
+	anx_import_private.h \
+	anx_mapping.h \
+	anx_private.h \
+	anx_snprint.h \
+	anx_tree.h \
+	cmml_header.h \
+	content_type.h \
+	fisbone.h \
+	fishead.h \
+	fix_dl.h \
+	xtag.h
+
 libannodex_la_SOURCES = \
 	$(anx_read_sources) $(anx_write_sources) \
 	anx_deprecated.c \
-	anx_compat.h \
 	anx_list.c \
 	anx_params.c \
-	anx_tree.c anx_tree.h \
-	anx_private.h \
-	anx_mapping.h \
-	anx_bos.h \
-	anx_byteswap.h \
+	anx_tree.c \
 	annodex.c \
 	anx_track.c \
-	anx_snprint.c anx_snprint.h \
-	anx_command.c anx_command.h \
+	anx_snprint.c \
+	anx_command.c \
 	anx_element.c \
-	anx_import.c anx_import_private.h \
+	anx_import.c \
 	anx_time.c \
 	anx_read.c \
 	anx_write.c \
-	content_type.c content_type.h
+	content_type.c
 
 libannodex_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
 libannodex_la_LIBADD = $(anx_write_libs) $(OGGZ_LIBS)


-- 
conrad