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

[Stan Seibert]

volsung     01/12/21 10:34:04

  Modified:    ogg123   Makefile.am
               oggenc   Makefile.am
               ogginfo  Makefile.am
               vcut     Makefile.am
               vorbiscomment Makefile.am
  Log:
  Reverted library reordering.  Original was correct.  :(

Revision  Changes    Path
1.19      +1 -1      vorbis-tools/ogg123/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Makefile.am	2001/12/21 02:45:58	1.18
+++ Makefile.am	2001/12/21 18:34:00	1.19
@@ -11,7 +11,7 @@
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@ @CURL_CFLAGS@ \
            @PTHREAD_CFLAGS@ @SHARE_CFLAGS@
 
-ogg123_LDADD = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ @AO_LIBS@ \
+ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
                @SOCKET_LIBS@ @SHARE_LIBS@ @CURL_LIBS@ @PTHREAD_CFLAGS@ \
                @PTHREAD_LIBS@
 ogg123_DEPENDENCIES = @SHARE_LIBS@

1.14      +1 -1      vorbis-tools/oggenc/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.am	2001/12/21 02:45:59	1.13
+++ Makefile.am	2001/12/21 18:34:02	1.14
@@ -8,7 +8,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
 
-oggenc_LDADD = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISENC_LIBS@ @LIBICONV@ \
+oggenc_LDADD = @VORBISENC_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ \
                @SHARE_LIBS@
 oggenc_DEPENDENCIES = @SHARE_LIBS@
 

1.8       +1 -1      vorbis-tools/ogginfo/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogginfo/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am	2001/12/21 02:45:59	1.7
+++ Makefile.am	2001/12/21 18:34:03	1.8
@@ -8,7 +8,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
 
-ogginfo_LDADD = @OGG_LIBS@ @VORBIS_LIBS@ @LIBICONV@ @SHARE_LIBS@
+ogginfo_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @SHARE_LIBS@
 ogginfo_DEPENDENCIES = @SHARE_LIBS@
 
 ogginfo_SOURCES = ogginfo.c

1.4       +1 -1      vorbis-tools/vcut/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vcut/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	2001/12/21 15:53:30	1.3
+++ Makefile.am	2001/12/21 18:34:03	1.4
@@ -8,7 +8,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
-vcut_LDADD = @OGG_LIBS@ @VORBIS_LIBS@
+vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@
 
 vcut_SOURCES = vcut.c vcut.h
 

1.12      +1 -1      vorbis-tools/vorbiscomment/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.am	2001/12/21 02:46:00	1.11
+++ Makefile.am	2001/12/21 18:34:04	1.12
@@ -6,7 +6,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
 
-vorbiscomment_LDADD = @OGG_LIBS@ @VORBIS_LIBS@ @LIBICONV@ @SHARE_LIBS@
+vorbiscomment_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @SHARE_LIBS@
 vorbiscomment_DEPENDENCIES = @SHARE_LIBS@
 
 vorbiscomment_SOURCES = vcedit.c vcedit.h vcomment.c

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