claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of CFLAGS/CXXFLAGS, now using AM_CFLAGS

Browse Source
This commit is contained in:
Josh Coalson
2005-01-30 18:44:46 +00:00
parent 3c8d2973cb
commit 05a3984002
14 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/flac/Makefile.am
View File

@@ -16,7 +16,8 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac bin_PROGRAMS = flac
CFLAGS = @CFLAGS@ @OGG_CFLAGS@
AM_CFLAGS = @OGG_CFLAGS@
if FLaC__HAS_OGG if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la

1
src/libFLAC++/Makefile.am
View File

@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libFLAC++.la lib_LTLIBRARIES = libFLAC++.la
CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC++.m4 m4data_DATA = libFLAC++.m4

3
src/libFLAC/Makefile.am
View File

@@ -43,7 +43,8 @@ else
CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
endif endif
endif endif
CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) $(CPUCFLAGS)
AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
if FLaC__NO_ASM if FLaC__NO_ASM
else else

1
src/libOggFLAC++/Makefile.am
View File

@@ -29,7 +29,6 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libOggFLAC++.la lib_LTLIBRARIES = libOggFLAC++.la
CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC++.m4 m4data_DATA = libOggFLAC++.m4

3
src/libOggFLAC/Makefile.am
View File

@@ -32,7 +32,8 @@ lib_LTLIBRARIES = libOggFLAC.la
if DEBUG if DEBUG
DEBUGCFLAGS = DEBUGCFLAGS =
endif endif
CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include . SUBDIRS = include .

1
src/metaflac/Makefile.am
View File

@@ -16,7 +16,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac bin_PROGRAMS = metaflac
CFLAGS = @CFLAGS@
EXTRA_DIST = \ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \

3
src/plugin_xmms/Makefile.am
View File

@@ -29,7 +29,8 @@ noinst_HEADERS = \
plugin.h \ plugin.h \
tag.h tag.h
CFLAGS = @CFLAGS@ @XMMS_CFLAGS@ AM_CFLAGS = @XMMS_CFLAGS@
INCLUDES = -I$(top_srcdir)/src INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins xmmsinputplugindir = $(HOME)/.xmms/Plugins

2
src/test_grabbag/cuesheet/Makefile.am
View File

@@ -19,8 +19,6 @@ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
test_cuesheet.dsp test_cuesheet.dsp
CFLAGS = @CFLAGS@
noinst_PROGRAMS = test_cuesheet noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \ test_cuesheet_SOURCES = \
main.c main.c

2
src/test_libFLAC++/Makefile.am
View File

@@ -15,8 +15,6 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
CFLAGS = @CFLAGS@
EXTRA_DIST = \ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
README \ README \

1
src/test_libFLAC/Makefile.am
View File

@@ -19,7 +19,6 @@ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
test_libFLAC.dsp test_libFLAC.dsp
CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC noinst_PROGRAMS = test_libFLAC

2
src/test_libOggFLAC++/Makefile.am
View File

@@ -20,7 +20,7 @@ EXTRA_DIST = \
README \ README \
test_libOggFLAC++.dsp test_libOggFLAC++.dsp
CFLAGS = @CFLAGS@ @OGG_CFLAGS@ AM_CFLAGS = @OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++ noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \ test_libOggFLAC___LDADD = \

3
src/test_libOggFLAC/Makefile.am
View File

@@ -19,7 +19,8 @@ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
test_libOggFLAC.dsp test_libOggFLAC.dsp
CFLAGS = @CFLAGS@ @OGG_CFLAGS@ AM_CFLAGS = @OGG_CFLAGS@
INCLUDES = INCLUDES =
noinst_PROGRAMS = test_libOggFLAC noinst_PROGRAMS = test_libOggFLAC

3
src/test_seeking/Makefile.am
View File

@@ -19,7 +19,8 @@ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
test_seeking.dsp test_seeking.dsp
CFLAGS = @CFLAGS@ @OGG_CFLAGS@ AM_CFLAGS = @OGG_CFLAGS@
INCLUDES = INCLUDES =
if FLaC__HAS_OGG if FLaC__HAS_OGG

2
src/test_streams/Makefile.am
View File

@@ -19,8 +19,6 @@ EXTRA_DIST = \
Makefile.lite \ Makefile.lite \
test_streams.dsp test_streams.dsp
CFLAGS = @CFLAGS@
noinst_PROGRAMS = test_streams noinst_PROGRAMS = test_streams
test_streams_SOURCES = \ test_streams_SOURCES = \
main.c main.c