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

[Jack Moffitt]

jack        00/10/26 15:50:54

  Modified:    .        Tag: branch_beta3 .cvsignore libvorbis.spec
               examples Tag: branch_beta3 Makefile.am
  Added:       .        Tag: branch_beta3 acinclude.m4
  Log:
  updated spec file with ali's changes
  updated cvsignore
  made examples build
  added acinclude.m4 (which contains ogg.m4) so you don't rely on having ogg to check for ogg :)

Revision  Changes    Path
No                   revision

No                   revision

1.2.2.1   +1 -0      vorbis/.cvsignore

Index: .cvsignore
===================================================================
RCS file: /usr/local/cvsroot/vorbis/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- .cvsignore	2000/10/12 03:12:36	1.2
+++ .cvsignore	2000/10/26 22:50:52	1.2.2.1
@@ -11,3 +11,4 @@
 .libs
 .deps
 *.ogg
+vorbis-config

1.2.2.2   +4 -2      vorbis/libvorbis.spec

Index: libvorbis.spec
===================================================================
RCS file: /usr/local/cvsroot/vorbis/libvorbis.spec,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- libvorbis.spec	2000/10/21 18:32:02	1.2.2.1
+++ libvorbis.spec	2000/10/26 22:50:52	1.2.2.2
@@ -47,8 +47,8 @@
 %defattr(-,root,root)
 %doc COPYING
 %doc README
-/usr/lib/libvorbis.so*
-/usr/lib/libvorbisfile.so*
+/usr/lib/libvorbis.so.*
+/usr/lib/libvorbisfile.so.*
 
 %files devel
 %doc doc/programming.html
@@ -72,6 +72,8 @@
 /usr/include/vorbis/book/res0_*.vqh
 /usr/include/vorbis/book/resaux0_*.vqh
 /usr/lib/libvorbis.a
+/usr/lib/libvorbis.so
+/usr/bin/vorbis-config
 
 %clean 
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT

No                   revision

No                   revision

1.1.2.1   +114 -0    vorbis/Attic/acinclude.m4

No                   revision

No                   revision

1.3.2.1   +4 -4      vorbis/examples/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis/examples/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- Makefile.am	2000/10/13 19:48:02	1.3
+++ Makefile.am	2000/10/26 22:50:53	1.3.2.1
@@ -7,16 +7,16 @@
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
                 vorbisfile_example seeking_example
 
-LDADD = $(top_srcdir)/lib/.libs/libvorbis.a
+LDADD = $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
 
 decoder_example_SOURCES = decoder_example.c
 encoder_example_SOURCES = encoder_example.c
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a
+chaining_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a
+vorbisfile_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a
+seeking_example_LDADD = $(top_srcdir)/lib/.libs/libvorbisfile.a $(top_srcdir)/lib/.libs/libvorbis.a $(OGG_LIBS)
 
 debug:
         $(MAKE) all CFLAGS="@DEBUG@"

--- >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.