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

[Ralph Giles]

giles       01/01/24 22:54:53

  Modified:    ogg123   Makefile.am
               oggenc   Makefile.am
               vorbiscomment Makefile.am
  Log:
  use _LDADD instead of the over-riding _LDFLAGS for ogg, vorbis and ao libs
  
  improve order for static linking
  
  Thanks for Jeff Squyres for this one.

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

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogg123/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	2001/01/23 08:56:43	1.10
+++ Makefile.am	2001/01/25 06:54:52	1.11
@@ -10,7 +10,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@
 
-ogg123_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISFILE_LIBS@ @AO_LIBS@
+ogg123_LDADD = @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@
 
 ogg123_SOURCES = ogg123.c ao_interface.c buffer.c ogg123.h buffer.h
 

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

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/oggenc/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am	2000/11/30 06:33:36	1.7
+++ Makefile.am	2001/01/25 06:54:52	1.8
@@ -8,7 +8,7 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
-oggenc_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@ @VORBISENC_LIBS@
+oggenc_LDADD = @VORBISENC_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@
 oggenc_SOURCES = oggenc.c audio.c encode.c getopt.c getopt1.c\
                 platform.c\
                 audio.h encode.h platform.h getopt.h

1.7       +2 -1      vorbis-tools/vorbiscomment/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/vorbiscomment/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	2001/01/19 11:39:23	1.6
+++ Makefile.am	2001/01/25 06:54:52	1.7
@@ -6,7 +6,8 @@
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@
 
-vorbiscomment_LDFLAGS = @OGG_LIBS@ @VORBIS_LIBS@
+vorbiscomment_LDADD = @VORBIS_LIBS@ @OGG_LIBS@
+
 vorbiscomment_SOURCES = vcedit.c vcedit.h vcomment.c
 
 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.