[xiph-cvs] cvs commit: vorbis/lib Makefile.am

[Jack Moffitt]

jack        00/11/07 16:22:36

  Modified:    .        configure.in
               doc      Makefile.am
               examples Makefile.am
               lib      Makefile.am
  Log:
  hoepfully this is the *right* thing.
  
  jack.

Revision  Changes    Path
1.28      +2 -2      vorbis/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/vorbis/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- configure.in	2000/11/06 03:15:50	1.27
+++ configure.in	2000/11/08 00:22:34	1.28
@@ -149,7 +149,7 @@
 AC_CHECK_LIB(m, cos, LIBS="-lm", LIBS="")
 AC_CHECK_LIB(pthread, pthread_create, pthread_lib="-lpthread", :)
 
-AM_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
+AM_PATH_OGG(LIBS="$LIBS $OGG_LIBS", AC_MSG_ERROR(must have Ogg installed!))
 
 dnl --------------------------------------------------
 dnl Check for library functions
@@ -166,4 +166,4 @@
 AC_SUBST(PROFILE)
 AC_SUBST(pthread_lib)
 
-AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)
+AC_OUTPUT(Makefile lib/Makefile lib/modes/Makefile lib/books/Makefile doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile include/Makefile include/vorbis/Makefile examples/Makefile)

1.5       +1 -1      vorbis/doc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/doc/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	2000/11/06 00:06:46	1.4
+++ Makefile.am	2000/11/08 00:22:35	1.5
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = vorbisfile
+SUBDIRS = vorbisfile vorbisenc
 
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 

1.6       +5 -5      vorbis/examples/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.am	2000/11/07 03:58:09	1.5
+++ Makefile.am	2000/11/08 00:22:35	1.6
@@ -7,17 +7,17 @@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
                 vorbisfile_example seeking_example
 
-LDADD = ../lib/libvorbis.la $(OGG_LIBS)
+LDADD = ../lib/libvorbis.la
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la $(OGG_LIBS)
+encoder_example_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la 
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+chaining_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+vorbisfile_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la $(OGG_LIBS)
+seeking_example_LDADD = ../lib/libvorbisfile.la ../lib/libvorbis.la 
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

1.5       +2 -0      vorbis/lib/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/lib/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.am	2000/11/07 03:58:10	1.4
+++ Makefile.am	2000/11/08 00:22:35	1.5
@@ -19,9 +19,11 @@
 libvorbis_la_LDFLAGS = -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
 
 libvorbisfile_la_SOURCES = vorbisfile.c
+#libvorbisfile_la_LIBADD = -L$(top_srcdir)/lib/.libs -lvorbis
 libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
 
 libvorbisenc_la_SOURCES = vorbisenc.c
+#libvorbisenc_la_LIBADD = -L$(top_srcdir)/lib/.libs -lvorbis
 libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
 
 EXTRA_DIST = barkmel.c tone.c psytune.c lookups.pl

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.