projects
/
platform
/
upstream
/
flac.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c8d297
)
fix handling of CFLAGS/CXXFLAGS, now using AM_CFLAGS
author
Josh Coalson
<jcoalson@users.sourceforce.net>
Sun, 30 Jan 2005 18:44:46 +0000
(18:44 +0000)
committer
Josh Coalson
<jcoalson@users.sourceforce.net>
Sun, 30 Jan 2005 18:44:46 +0000
(18:44 +0000)
14 files changed:
src/flac/Makefile.am
patch
|
blob
|
history
src/libFLAC++/Makefile.am
patch
|
blob
|
history
src/libFLAC/Makefile.am
patch
|
blob
|
history
src/libOggFLAC++/Makefile.am
patch
|
blob
|
history
src/libOggFLAC/Makefile.am
patch
|
blob
|
history
src/metaflac/Makefile.am
patch
|
blob
|
history
src/plugin_xmms/Makefile.am
patch
|
blob
|
history
src/test_grabbag/cuesheet/Makefile.am
patch
|
blob
|
history
src/test_libFLAC++/Makefile.am
patch
|
blob
|
history
src/test_libFLAC/Makefile.am
patch
|
blob
|
history
src/test_libOggFLAC++/Makefile.am
patch
|
blob
|
history
src/test_libOggFLAC/Makefile.am
patch
|
blob
|
history
src/test_seeking/Makefile.am
patch
|
blob
|
history
src/test_streams/Makefile.am
patch
|
blob
|
history
diff --git
a/src/flac/Makefile.am
b/src/flac/Makefile.am
index
86188b4
..
e685c0b
100644
(file)
--- a/
src/flac/Makefile.am
+++ b/
src/flac/Makefile.am
@@
-16,7
+16,8
@@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+
+AM_CFLAGS = @OGG_CFLAGS@
if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
if FLaC__HAS_OGG
NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
diff --git
a/src/libFLAC++/Makefile.am
b/src/libFLAC++/Makefile.am
index
bab0808
..
36d27af
100644
(file)
--- a/
src/libFLAC++/Makefile.am
+++ b/
src/libFLAC++/Makefile.am
@@
-29,7
+29,6
@@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libFLAC++.la
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC++.m4
m4datadir = $(datadir)/aclocal
m4data_DATA = libFLAC++.m4
diff --git
a/src/libFLAC/Makefile.am
b/src/libFLAC/Makefile.am
index
371cdae
..
389a96d
100644
(file)
--- a/
src/libFLAC/Makefile.am
+++ b/
src/libFLAC/Makefile.am
@@
-43,7
+43,8
@@
else
CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
endif
endif
CPUCFLAGS = -maltivec -mabi=altivec -force_cpusubtype_ALL -DFLAC__NO_ASM
endif
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS) $(CPUCFLAGS)
+
+AM_CFLAGS = $(DEBUGCFLAGS) $(CPUCFLAGS)
if FLaC__NO_ASM
else
if FLaC__NO_ASM
else
diff --git
a/src/libOggFLAC++/Makefile.am
b/src/libOggFLAC++/Makefile.am
index
46e9f7c
..
ad7291a
100644
(file)
--- a/
src/libOggFLAC++/Makefile.am
+++ b/
src/libOggFLAC++/Makefile.am
@@
-29,7
+29,6
@@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libOggFLAC++.la
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
lib_LTLIBRARIES = libOggFLAC++.la
-CXXFLAGS = @CXXFLAGS@
m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC++.m4
m4datadir = $(datadir)/aclocal
m4data_DATA = libOggFLAC++.m4
diff --git
a/src/libOggFLAC/Makefile.am
b/src/libOggFLAC/Makefile.am
index
340d124
..
fc25953
100644
(file)
--- a/
src/libOggFLAC/Makefile.am
+++ b/
src/libOggFLAC/Makefile.am
@@
-32,7
+32,8
@@
lib_LTLIBRARIES = libOggFLAC.la
if DEBUG
DEBUGCFLAGS =
endif
if DEBUG
DEBUGCFLAGS =
endif
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@ $(DEBUGCFLAGS)
+
+AM_CFLAGS = @OGG_CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .
SUBDIRS = include .
diff --git
a/src/metaflac/Makefile.am
b/src/metaflac/Makefile.am
index
8abd2fc
..
fff3a1f
100644
(file)
--- a/
src/metaflac/Makefile.am
+++ b/
src/metaflac/Makefile.am
@@
-16,7
+16,6
@@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@
EXTRA_DIST = \
Makefile.lite \
EXTRA_DIST = \
Makefile.lite \
diff --git
a/src/plugin_xmms/Makefile.am
b/src/plugin_xmms/Makefile.am
index
18afa2d
..
bf1b78e
100644
(file)
--- a/
src/plugin_xmms/Makefile.am
+++ b/
src/plugin_xmms/Makefile.am
@@
-29,7
+29,8
@@
noinst_HEADERS = \
plugin.h \
tag.h
plugin.h \
tag.h
-CFLAGS = @CFLAGS@ @XMMS_CFLAGS@
+AM_CFLAGS = @XMMS_CFLAGS@
+
INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins
INCLUDES = -I$(top_srcdir)/src
if FLaC__INSTALL_XMMS_PLUGIN_LOCALLY
xmmsinputplugindir = $(HOME)/.xmms/Plugins
diff --git
a/src/test_grabbag/cuesheet/Makefile.am
b/src/test_grabbag/cuesheet/Makefile.am
index
a11d752
..
0fc1822
100644
(file)
--- a/
src/test_grabbag/cuesheet/Makefile.am
+++ b/
src/test_grabbag/cuesheet/Makefile.am
@@
-19,8
+19,6
@@
EXTRA_DIST = \
Makefile.lite \
test_cuesheet.dsp
Makefile.lite \
test_cuesheet.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
noinst_PROGRAMS = test_cuesheet
test_cuesheet_SOURCES = \
main.c
diff --git
a/src/test_libFLAC++/Makefile.am
b/src/test_libFLAC++/Makefile.am
index
ea7ce0c
..
a722778
100644
(file)
--- a/
src/test_libFLAC++/Makefile.am
+++ b/
src/test_libFLAC++/Makefile.am
@@
-15,8
+15,6
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-CFLAGS = @CFLAGS@
-
EXTRA_DIST = \
Makefile.lite \
README \
EXTRA_DIST = \
Makefile.lite \
README \
diff --git
a/src/test_libFLAC/Makefile.am
b/src/test_libFLAC/Makefile.am
index
e9a07aa
..
db1baf9
100644
(file)
--- a/
src/test_libFLAC/Makefile.am
+++ b/
src/test_libFLAC/Makefile.am
@@
-19,7
+19,6
@@
EXTRA_DIST = \
Makefile.lite \
test_libFLAC.dsp
Makefile.lite \
test_libFLAC.dsp
-CFLAGS = @CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
diff --git
a/src/test_libOggFLAC++/Makefile.am
b/src/test_libOggFLAC++/Makefile.am
index
1615a81
..
c2de526
100644
(file)
--- a/
src/test_libOggFLAC++/Makefile.am
+++ b/
src/test_libOggFLAC++/Makefile.am
@@
-20,7
+20,7
@@
EXTRA_DIST = \
README \
test_libOggFLAC++.dsp
README \
test_libOggFLAC++.dsp
-
CFLAGS = @CFLAGS@
@OGG_CFLAGS@
+
AM_CFLAGS =
@OGG_CFLAGS@
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \
noinst_PROGRAMS = test_libOggFLAC++
test_libOggFLAC___LDADD = \
diff --git
a/src/test_libOggFLAC/Makefile.am
b/src/test_libOggFLAC/Makefile.am
index
59a2aed
..
63f3bb9
100644
(file)
--- a/
src/test_libOggFLAC/Makefile.am
+++ b/
src/test_libOggFLAC/Makefile.am
@@
-19,7
+19,8
@@
EXTRA_DIST = \
Makefile.lite \
test_libOggFLAC.dsp
Makefile.lite \
test_libOggFLAC.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
INCLUDES =
noinst_PROGRAMS = test_libOggFLAC
diff --git
a/src/test_seeking/Makefile.am
b/src/test_seeking/Makefile.am
index
1036180
..
f590a85
100644
(file)
--- a/
src/test_seeking/Makefile.am
+++ b/
src/test_seeking/Makefile.am
@@
-19,7
+19,8
@@
EXTRA_DIST = \
Makefile.lite \
test_seeking.dsp
Makefile.lite \
test_seeking.dsp
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+AM_CFLAGS = @OGG_CFLAGS@
+
INCLUDES =
if FLaC__HAS_OGG
INCLUDES =
if FLaC__HAS_OGG
diff --git
a/src/test_streams/Makefile.am
b/src/test_streams/Makefile.am
index
3b82127
..
13b1f47
100644
(file)
--- a/
src/test_streams/Makefile.am
+++ b/
src/test_streams/Makefile.am
@@
-19,8
+19,6
@@
EXTRA_DIST = \
Makefile.lite \
test_streams.dsp
Makefile.lite \
test_streams.dsp
-CFLAGS = @CFLAGS@
-
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \
main.c
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \
main.c