[xiph-commits] r3834 - liboggz/trunk/src/tools

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-12-20 02:38:18 -0800 (Sat, 20 Dec 2008)
New Revision: 3834

Modified:
   liboggz/trunk/src/tools/Makefile.am
Log:
add dirac.c as a source file to the oggz tools, rather than a lib.
The previous would try to compile at link time, and would not include the
right -I flags, and this will fail when including config.h in dirac.c
Patch by ogg.k.ogg.k:
http://lists.xiph.org/pipermail/ogg-dev/2008-December/001319.html

Modified: liboggz/trunk/src/tools/Makefile.am
===================================================================
--- liboggz/trunk/src/tools/Makefile.am	2008-12-20 10:38:09 UTC (rev 3833)
+++ liboggz/trunk/src/tools/Makefile.am	2008-12-20 10:38:18 UTC (rev 3834)
@@ -12,8 +12,10 @@
            @OGG_CFLAGS@
 
 OGGZDIR = ../liboggz
-OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@ $(srcdir)/../liboggz/dirac.c
+OGGZ_LIBS = $(OGGZDIR)/liboggz.la @OGG_LIBS@
 
+COMMON_SRCS=oggz_tools.c $(srcdir)/../liboggz/dirac.c
+
 oggz_any_programs = oggz oggz-known-codecs
 
 if OGGZ_CONFIG_READ
@@ -39,31 +41,31 @@
 oggz_known_codecs_SOURCES = oggz-known-codecs.c
 oggz_known_codecs_LDADD = $(OGGZ_LIBS)
 
-oggz_info_SOURCES = oggz-info.c oggz_tools.c skeleton.c 
+oggz_info_SOURCES = oggz-info.c skeleton.c $(COMMON_SRCS)
 oggz_info_LDADD = $(OGGZ_LIBS) -lm
 
-oggz_comment_SOURCES = oggz-comment.c oggz_tools.c
+oggz_comment_SOURCES = oggz-comment.c $(COMMON_SRCS)
 oggz_comment_LDADD = $(OGGZ_LIBS)
 
-oggz_dump_SOURCES = oggz-dump.c oggz_tools.c
+oggz_dump_SOURCES = oggz-dump.c $(COMMON_SRCS)
 oggz_dump_LDADD = $(OGGZ_LIBS)
 
-oggz_merge_SOURCES = oggz-merge.c oggz_tools.c
+oggz_merge_SOURCES = oggz-merge.c $(COMMON_SRCS)
 oggz_merge_LDADD = $(OGGZ_LIBS)
 
-oggz_rip_SOURCES = oggz-rip.c oggz_tools.c
+oggz_rip_SOURCES = oggz-rip.c $(COMMON_SRCS)
 oggz_rip_LDADD = $(OGGZ_LIBS)
 
-oggz_validate_SOURCES = oggz-validate.c oggz_tools.c
+oggz_validate_SOURCES = oggz-validate.c $(COMMON_SRCS)
 oggz_validate_LDADD = $(OGGZ_LIBS)
 
-oggz_basetime_SOURCES = oggz-basetime.c oggz_tools.c
+oggz_basetime_SOURCES = oggz-basetime.c $(COMMON_SRCS)
 oggz_basetime_LDADD = $(OGGZ_LIBS)
 
-oggz_scan_SOURCES = oggz-scan.c oggz_tools.c
+oggz_scan_SOURCES = oggz-scan.c $(COMMON_SRCS)
 oggz_scan_LDADD = $(OGGZ_LIBS)
 
-oggz_sort_SOURCES = oggz-sort.c oggz_tools.c
+oggz_sort_SOURCES = oggz-sort.c $(COMMON_SRCS)
 oggz_sort_LDADD = $(OGGZ_LIBS)
 
 # Add symlinks for deprecated tool names, if they are already installed;