Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move all stuff that actually belongs in CPPFLAGS (but is called CFLAGS) to AM_CPPFLAGS 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3988 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-03-10 10:50:58 +00:00
parent 037471b784
commit 33216b2e9d
11 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/framework/Makefile.am
View File

@ -4,8 +4,8 @@
%.lex.c:: %.l %.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $< $(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS) AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d AM_YFLAGS = -d
BUILT_SOURCES = resource_lexer.lex.c strres_lexer.lex.c resource_parser.tab.c strres_parser.tab.c resource_parser.tab.h strres_parser.tab.h BUILT_SOURCES = resource_lexer.lex.c strres_lexer.lex.c resource_parser.tab.c strres_parser.tab.c resource_parser.tab.h strres_parser.tab.h

4
lib/gamelib/Makefile.am
View File

@ -4,8 +4,8 @@
%.lex.c:: %.l %.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $< $(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS) AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d AM_YFLAGS = -d
BUILT_SOURCES = audp_lexer.lex.c audp_parser.tab.c audp_parser.tab.h BUILT_SOURCES = audp_lexer.lex.c audp_parser.tab.c audp_parser.tab.h

3
lib/ivis_common/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libivis_common.a noinst_LIBRARIES = libivis_common.a
noinst_HEADERS = bitimage.h imd.h ivi.h ivisdef.h \ noinst_HEADERS = bitimage.h imd.h ivi.h ivisdef.h \

3
lib/ivis_opengl/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(PNG_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libivis_opengl.a noinst_LIBRARIES = libivis_opengl.a
noinst_HEADERS = piematrix.h screen.h noinst_HEADERS = piematrix.h screen.h

3
lib/netplay/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libnetplay.a noinst_LIBRARIES = libnetplay.a
noinst_HEADERS = netlog.h netplay.h nettypes.h noinst_HEADERS = netlog.h netplay.h nettypes.h

4
lib/script/Makefile.am
View File

@ -4,8 +4,8 @@
%.lex.c:: %.l %.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $< $(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS) AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d AM_YFLAGS = -d
BUILT_SOURCES = script_lexer.lex.c chat_lexer.lex.c script_parser.tab.c chat_parser.tab.c script_parser.tab.h chat_parser.tab.h BUILT_SOURCES = script_lexer.lex.c chat_lexer.lex.c script_parser.tab.c chat_parser.tab.c script_parser.tab.h chat_parser.tab.h

3
lib/sequence/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libsequence.a noinst_LIBRARIES = libsequence.a
noinst_HEADERS = sequence.h noinst_HEADERS = sequence.h

3
lib/sound/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libsound.a noinst_LIBRARIES = libsound.a
noinst_HEADERS = aud.h audio.h audio_id.h cdaudio.h mixer.h oggvorbis.h openal_error.h track.h tracklib.h noinst_HEADERS = aud.h audio.h audio_id.h cdaudio.h mixer.h oggvorbis.h openal_error.h track.h tracklib.h

3
lib/sqlite3/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) -Wno-missing-field-initializers AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS) -Wno-missing-field-initializers
noinst_LIBRARIES = libsqlite3.a noinst_LIBRARIES = libsqlite3.a
noinst_HEADERS = physfs_vfs.h sqlite3ext.h sqlite3.h noinst_HEADERS = physfs_vfs.h sqlite3ext.h sqlite3.h

3
lib/widget/Makefile.am
View File

@ -1,4 +1,5 @@
AM_CFLAGS = $(SDL_CFLAGS) $(WZ_CFLAGS) AM_CPPFLAGS = $(SDL_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(WZ_CFLAGS)
noinst_LIBRARIES = libwidget.a noinst_LIBRARIES = libwidget.a
noinst_HEADERS = bar.h button.h editbox.h form.h label.h scrap.h slider.h tip.h \ noinst_HEADERS = bar.h button.h editbox.h form.h label.h scrap.h slider.h tip.h \

4
src/Makefile.am
View File

@ -4,8 +4,8 @@
%.lex.c:: %.l %.lex.c:: %.l
$(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $< $(LEX) $(LFLAGS) $(AM_LFLAGS) -o$@ $<
AM_CPPFLAGS = -DYY_NO_INPUT $(WZ_CPPFLAGS) AM_CPPFLAGS = -DYY_NO_INPUT $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CPPFLAGS)
AM_CFLAGS = $(SDL_CFLAGS) $(SDL_NET_CFLAGS) $(PHYSFS_CFLAGS) $(PNG_CFLAGS) $(OGGVORBIS_CFLAGS) $(OPENAL_CFLAGS) $(OPENGLC_CFLAGS) $(OPENGL_CFLAGS) $(POPT_CFLAGS) $(WZ_CFLAGS) AM_CFLAGS = $(WZ_CFLAGS)
AM_LFLAGS = $(FLEX_FLAGS) AM_LFLAGS = $(FLEX_FLAGS)
AM_YFLAGS = -d AM_YFLAGS = -d
BUILT_SOURCES = level_lexer.lex.c scriptvals_lexer.lex.c scriptvals_parser.tab.c scriptvals_parser.tab.h BUILT_SOURCES = level_lexer.lex.c scriptvals_lexer.lex.c scriptvals_parser.tab.c scriptvals_parser.tab.h