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

[Stan Seibert]

volsung     01/12/20 18:46:00

  Modified:    ogg123   Makefile.am
               oggenc   Makefile.am
               ogginfo  Makefile.am
               vcut     Makefile.am
               vorbiscomment Makefile.am
  Log:
  Order libraries so that dependencies are to the left.  Mostly asthetic, but
  in the case of vorbisfile/vorbisenc, the -L library search argument is
  needed from @VORBIS_LIBS@, so we do need to put it to the left.

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

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

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

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

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

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

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

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vcut/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2001/07/04 14:58:41	1.1
+++ Makefile.am	2001/12/21 02:45:59	1.2
@@ -6,7 +6,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
-vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@
+vcut_LDADD = @OGG_LIBS@ @VORBIS_LIBS@
 
 vcut_SOURCES = vcut.c vcut.h
 

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

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	2001/12/19 02:52:59	1.10
+++ Makefile.am	2001/12/21 02:46:00	1.11
@@ -6,7 +6,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@
 
-vorbiscomment_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @SHARE_LIBS@
+vorbiscomment_LDADD = @OGG_LIBS@ @VORBIS_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.