[xiph-commits] r10087 - in trunk/theora: examples tests
conrad at svn.xiph.org
conrad at svn.xiph.org
Wed Sep 28 10:08:16 PDT 2005
Author: conrad
Date: 2005-09-28 10:08:13 -0700 (Wed, 28 Sep 2005)
New Revision: 10087
Modified:
trunk/theora/examples/Makefile.am
trunk/theora/tests/Makefile.am
Log:
add OGG_CFLAGS and VORBIS_CFLAGS as appropriate in Makefile.am's, to build
examples correctly when these are installed in non-standard locations.
Closes ticket:711
Modified: trunk/theora/examples/Makefile.am
===================================================================
--- trunk/theora/examples/Makefile.am 2005-09-28 16:41:47 UTC (rev 10086)
+++ trunk/theora/examples/Makefile.am 2005-09-28 17:08:13 UTC (rev 10087)
@@ -16,11 +16,12 @@
dump_video_DEPENDENCIES = $(GETOPT_OBJS)
player_example_SOURCES = player_example.c
-player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS)
+player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
encoder_example_SOURCES = encoder_example.c
EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
+encoder_example_CFLAGS = $(OGG_CFLAGS) $(VORBIS_CFLAGS)
encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(VORBIS_LIBS) $(VORBISENC_LIBS)
encoder_example_DEPENDENCIES = $(GETOPT_OBJS)
Modified: trunk/theora/tests/Makefile.am
===================================================================
--- trunk/theora/tests/Makefile.am 2005-09-28 16:41:47 UTC (rev 10086)
+++ trunk/theora/tests/Makefile.am 2005-09-28 17:08:13 UTC (rev 10087)
@@ -2,6 +2,8 @@
noinst_HEADERS = tests.h
+AM_CFLAGS = $(OGG_CFLAGS)
+
THEORADIR = ../lib
THEORA_LIBS = $(THEORADIR)/libtheora.la $(OGG_LIBS)
More information about the commits
mailing list