qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix a pile of automake deprecation warnings.

Browse source 
s/INCLUDES/AM_CPPFLAGS/g

I <3 sed :)
This commit is contained in:
Bill Currie 2013-11-24 13:11:50 +09:00
parent 6996e7295a
commit f5501fbf24
48 changed files with 51 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hw/source/Makefile.am
View file

@ -30,7 +30,7 @@
AUTOMAKE_OPTIONS= foreign
# Stuff that is common to both client and server
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/hw/include
AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/hw/include
SDL_LIBS = @SDL_LIBS@
bin_PROGRAMS= @HW_TARGETS@

2
libs/audio/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
SUBDIRS= targets renderer . test
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
SDL_LIBS= @SDL_LIBS@
XMMS_LIBS= @XMMS_LIBS@
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)

2
libs/audio/renderer/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@ \
$(VORBIS_CFLAGS) $(OGG_CFLAGS) $(SAMPLERATE_CFLAGS) $(JACK_CFLAGS)
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
plugin_libadd= @plugin_libadd@
EXEEXT=

2
libs/audio/targets/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
SDL_LIBS = @SDL_LIBS@
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
plugin_libadd= @plugin_libadd@

2
libs/audio/test/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_PROGRAMS= @AUDIO_TARGETS@

2
libs/client/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libQFclient.la

2
libs/console/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
plugin_ldflags= @plugin_ldflags@ -avoid-version -module -rpath $(plugindir)
plugin_libadd= @plugin_libadd@
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \

2
libs/gamecode/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
lib_ldflags=
gc_deps=$(top_builddir)/libs/util/libQFutil.la

2
libs/gib/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined

2
libs/models/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
SUBDIRS= alias brush iqm sprite . test
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
lib_LTLIBRARIES= libQFmodels.la
noinst_LTLIBRARIES= @models_libs@

2
libs/models/alias/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= @alias_libs@
EXTRA_LTLIBRARIES=libalias_gl.la libalias_glsl.la libalias_sw.la

2
libs/models/brush/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libbrush.la @brush_libs@
EXTRA_LTLIBRARIES=libbrush_gl.la libbrush_glsl.la libbrush_sw.la

2
libs/models/iqm/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= @iqm_libs@
EXTRA_LTLIBRARIES=libiqm_gl.la libiqm_glsl.la libiqm_sw.la

2
libs/models/sprite/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= @sprite_libs@
EXTRA_LTLIBRARIES=libsprite_gl.la libsprite_glsl.la libsprite_sw.la

2
libs/models/test/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(srcdir) -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(srcdir) -I$(top_srcdir)/include
check_PROGRAMS=testclip testcontents testportals
EXTRA_DIST= trace-id.c trace-qf-bad.c hulls.h main.c

2
libs/net/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
SUBDIRS= nc nm
AM_CFLAGS= @PREFER_NON_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libnet_chan.la libnet_main.la

2
libs/net/nc/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_NON_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libnc.la

2
libs/net/nm/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_NON_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libnm.la

2
libs/qw/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LIBRARIES= libqw.a

2
libs/ruamoko/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(FNM_FLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(FNM_FLAGS)
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined

2
libs/util/Makefile.am
View file

@ -4,7 +4,7 @@ SUBDIRS= . test
AM_CFLAGS= @PREFER_PIC@
CCASFLAGS+= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(Z_CFLAGS) $(FNM_FLAGS)
lib_LTLIBRARIES= libQFutil.la

2
libs/util/test/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
check_PROGRAMS= \
test-bary test-cs test-dq test-half test-mat3 test-mat4 test-plist \

2
libs/video/renderer/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
SUBDIRS= @vid_render_dirs@
DIST_SUBDIRS= gl glsl sw sw32
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined

2
libs/video/renderer/gl/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
noinst_LTLIBRARIES= libgl.la

2
libs/video/renderer/glsl/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(GLX_CFLAGS)
shader_src= \
iqm.frag iqm.vert \

2
libs/video/renderer/sw/Makefile.am
View file

@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
CCASFLAGS+= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
asm = @swrend_libs@

2
libs/video/renderer/sw32/Makefile.am
View file

@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS= foreign
AM_CFLAGS= @PREFER_PIC@
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
noinst_LTLIBRARIES= libsw32.la

2
libs/video/targets/Makefile.am
View file

@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/include
lib_ldflags=-version-info $(QUAKE_LIBRARY_VERSION_INFO) \
-rpath $(libdir) -no-undefined

2
nq/source/Makefile.am
View file

@ -30,7 +30,7 @@ AUTOMAKE_OPTIONS= foreign
# Stuff that is common to both client and server
#
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/nq/include
SDL_LIBS = @SDL_LIBS@
AM_CFLAGS= @PTHREAD_CFLAGS@

2
qtv/source/Makefile.am
View file

@ -29,7 +29,7 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qtv/include
AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/qtv/include
bin_PROGRAMS= @QTV_TARGETS@

2
qw/source/Makefile.am
View file

@ -30,7 +30,7 @@
AUTOMAKE_OPTIONS= foreign
# Stuff that is common to both client and server
INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@
AM_CPPFLAGS= -I$(top_srcdir)/include -I$(top_srcdir)/qw/include @LIBCURL_CFLAGS@
SDL_LIBS = @SDL_LIBS@
AM_CFLAGS= @PTHREAD_CFLAGS@

4
ruamoko/gui/Makefile.am
View file

@ -4,11 +4,11 @@ pkglibdir=$(datarootdir)/qfcc/lib
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
QCPPFLAGS=$(INCLUDES)
QCPPFLAGS=$(AM_CPPFLAGS)
PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
RANLIB=touch
INCLUDES= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
gui_libs=libgui.a
libs=$(gui_libs)

4
ruamoko/lib/Makefile.am
View file

@ -4,11 +4,11 @@ pkglibdir=$(datarootdir)/qfcc/lib
QFCC=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QCFLAGS=-qq -O -g -Wall -Wno-integer-divide -Werror --no-default-paths
QCPPFLAGS=$(INCLUDES)
QCPPFLAGS=$(AM_CPPFLAGS)
PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
RANLIB=touch
INCLUDES= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
noinst_HEADERS= \
Array+Private.h

4
ruamoko/scheme/Makefile.am
View file

@ -5,7 +5,7 @@ pkglibdir=$(datarootdir)/qfcc/lib
QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QFCC=$(QFCC_DEP)
QCFLAGS=-qq -O -g -Werror -Wall -Wno-integer-divide --no-default-paths
QCPPFLAGS=$(INCLUDES)
QCPPFLAGS=$(AM_CPPFLAGS)
PAK=$(top_builddir)/tools/pak/pak$(EXEEXT)
GZIP=if echo $@ | grep -q .gz; then gzip -f `basename $@ .gz`; if test -f `basename $@ .dat.gz`.sym; then gzip -f `basename $@ .dat.gz`.sym; fi; fi
GZ=@progs_gz@
@ -15,7 +15,7 @@ STRIP=`echo -n $(srcdir)/ | sed -e 's/[^/]//g' | wc -c`
RANLIB=touch
INCLUDES= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
AM_CPPFLAGS= -I$(top_srcdir)/ruamoko/include -I$(top_srcdir)/include
scheme_libs=libscheme.a
libs=$(scheme_libs)

2
tools/bsp2img/Makefile.am
View file

@ -2,7 +2,7 @@ BSP2IMG_LIBS=@BSP2IMG_LIBS@
BSP2IMG_DEPS=@BSP2IMG_DEPS@
BSP2IMG_INCS=@BSP2IMG_INCS@
INCLUDES= -I$(top_srcdir)/include $(BSP2IMG_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(BSP2IMG_INCS)
bin_PROGRAMS=bsp2img

2
tools/carne/Makefile.am
View file

@ -4,7 +4,7 @@ CARNE_LIBS=@CARNE_LIBS@
CARNE_DEPS=@CARNE_DEPS@
PAK_INCS=@CARNE_INCS@
INCLUDES= -I$(top_srcdir)/include $(CARNE_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(CARNE_INCS)
noinst_PROGRAMS= carne

2
tools/pak/Makefile.am
View file

@ -4,7 +4,7 @@ PAK_LIBS=@PAK_LIBS@
PAK_DEPS=@PAK_DEPS@
PAK_INCS=@PAK_INCS@
INCLUDES= -I$(top_srcdir)/include $(PAK_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(PAK_INCS)
bin_PROGRAMS= pak
bin_SCRIPTS= zpak

2
tools/qfbsp/source/Makefile.am
View file

@ -4,7 +4,7 @@ QFBSP_LIBS=@QFBSP_LIBS@
QFBSP_DEPS=@QFBSP_DEPS@
QFBSP_INCS=@QFBSP_INCS@
INCLUDES= -I$(top_srcdir)/include $(QFBSP_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFBSP_INCS)
bin_PROGRAMS= qfbsp

2
tools/qfcc/source/Makefile.am
View file

@ -32,7 +32,7 @@ QFCC_LIBS=@QFCC_LIBS@
QFCC_DEPS=@QFCC_DEPS@
QFCC_INCS=@QFCC_INCS@
INCLUDES= -I$(top_srcdir)/include $(QFCC_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
YFLAGS = -v -d
bin_PROGRAMS= qfcc qfprogs

2
tools/qfcc/test/Makefile.am
View file

@ -1,5 +1,5 @@
AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include $(QFCC_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFCC_INCS)
QFCC_DEP=$(builddir)/../source/qfcc$(EXEEXT)
QFCC=$(QFCC_DEP)

2
tools/qflight/source/Makefile.am
View file

@ -6,7 +6,7 @@ QFLIGHT_INCS=@QFLIGHT_INCS@
PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
INCLUDES= -I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLIGHT_INCS) $(PTHREAD_CFLAGS)
bin_PROGRAMS= qflight

2
tools/qflmp/Makefile.am
View file

@ -4,7 +4,7 @@ QFLMP_LIBS=@QFLMP_LIBS@
QFLMP_DEPS=@QFLMP_DEPS@
QFLMP_INCS=@QFLMP_INCS@
INCLUDES= -I$(top_srcdir)/include $(QFLMP_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFLMP_INCS)
bin_PROGRAMS= qflmp

2
tools/qfmodelgen/source/Makefile.am
View file

@ -4,7 +4,7 @@ QFMODELGEN_LIBS=@QFMODELGEN_LIBS@
QFMODELGEN_DEPS=@QFMODELGEN_DEPS@
QFMODELGEN_INCS=@QFMODELGEN_INCS@
INCLUDES= -I$(top_srcdir)/include $(QFMODELGEN_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFMODELGEN_INCS)
bin_PROGRAMS= qfmodelgen

2
tools/qfspritegen/Makefile.am
View file

@ -4,7 +4,7 @@ QFSPRITEGEN_LIBS=@QFSPRITEGEN_LIBS@
QFSPRITEGEN_DEPS=@QFSPRITEGEN_DEPS@
QFSPRITEGEN_INCS=@QFSPRITEGEN_INCS@
INCLUDES= -I$(top_srcdir)/include $(QFSPRITEGEN_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFSPRITEGEN_INCS)
bin_PROGRAMS= qfspritegen

2
tools/qfvis/source/Makefile.am
View file

@ -6,7 +6,7 @@ QFVIS_INCS=@QFVIS_INCS@
PTHREAD_LDFLAGS=@PTHREAD_LDFLAGS@
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
INCLUDES= -I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QFVIS_INCS) $(PTHREAD_CFLAGS)
bin_PROGRAMS= qfvis

2
tools/qwaq/Makefile.am
View file

@ -2,7 +2,7 @@ QWAQ_LIBS=@QWAQ_LIBS@
QWAQ_DEPS=@QWAQ_DEPS@
QWAQ_INCS=@QWAQ_INCS@
INCLUDES= -I$(top_srcdir)/include $(QWAQ_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(QWAQ_INCS)
QFCC_DEP=$(top_builddir)/tools/qfcc/source/qfcc$(EXEEXT)
QFCC=$(top_builddir)/tools/qfcc/source/qfcc

2
tools/wad/Makefile.am
View file

@ -4,7 +4,7 @@ WAD_LIBS=@WAD_LIBS@
WAD_DEPS=@WAD_DEPS@
WAD_INCS=@WAD_INCS@
INCLUDES= -I$(top_srcdir)/include $(WAD_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(WAD_INCS)
bin_PROGRAMS= wad

2
tools/wav/Makefile.am
View file

@ -4,7 +4,7 @@ WAV_LIBS=@WAV_LIBS@
WAV_DEPS=@WAV_DEPS@
WAV_INCS=@WAV_INCS@
INCLUDES= -I$(top_srcdir)/include $(WAV_INCS)
AM_CPPFLAGS= -I$(top_srcdir)/include $(WAV_INCS)
bin_PROGRAMS= qfwavinfo