From fceae5849b57feab320e768696564b3b93bcddc7 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Sun, 24 Mar 2002 23:31:56 +0000 Subject: Get rid of GLOBAL_CFLAGS, use CFLAGS instead. Note: maybe things are broken now, so check and report, thanks. CVS patchset: 1629 CVS date: 2002/03/24 23:31:56 --- src/libvorbis/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libvorbis') diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am index ea5e6e04b..07da7bfce 100644 --- a/src/libvorbis/Makefile.am +++ b/src/libvorbis/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @GLOBAL_CFLAGS@ @VORBIS_CFLAGS@ +CFLAGS = @CFLAGS@ $(VORBIS_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -15,11 +15,11 @@ endif lib_LTLIBRARIES = $(vorbis_module) xineplug_decode_vorbis_la_SOURCES = xine_decoder.c -xineplug_decode_vorbis_la_LIBADD = @VORBIS_LIBS@ +xineplug_decode_vorbis_la_LIBADD = $(VORBIS_LIBS) xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @OGG_CFLAGS@ @VORBIS_CFLAGS@" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -- cgit v1.2.3