diff --git a/doc/Makefile.am b/doc/Makefile.am index c2b3f72f1..04f08a6b1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= man EXTRA_DIST= 3dfx.txt CodingStyle cvarlist.txt glqnotes.txt makefile.linuxi386 \ makefile.solaris net_DoS_protection.txt progdefs.q1 progdefs.q2 \ diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 011e9ef16..5249e3a26 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,2 +1,4 @@ ## Process this file with automake to produce Makefile.in +AUTOMAKE_OPTIONS= foreign + EXTRA_DIST= quakeforge.1 diff --git a/libs/Makefile.am b/libs/Makefile.am index 1e5a8b416..86127765d 100644 --- a/libs/Makefile.am +++ b/libs/Makefile.am @@ -1 +1,3 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= audio console gamecode gib models video util diff --git a/libs/audio/Makefile.am b/libs/audio/Makefile.am index 7e7c82e22..5131326f1 100644 --- a/libs/audio/Makefile.am +++ b/libs/audio/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS=cd targets renderer INCLUDES=-I$(top_srcdir)/include diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am index d6449908e..ee598eac0 100644 --- a/libs/audio/cd/Makefile.am +++ b/libs/audio/cd/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) $(XMMS_CFLAGS) SDL_LIBS= @SDL_LIBS@ XMMS_LIBS= @XMMS_LIBS@ diff --git a/libs/audio/renderer/Makefile.am b/libs/audio/renderer/Makefile.am index 20d7ee517..e8c413101 100644 --- a/libs/audio/renderer/Makefile.am +++ b/libs/audio/renderer/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include PLUGIN_RPATH= @PLUGIN_RPATH@ diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index e8899bc68..a5124134c 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS) SDL_LIBS = @SDL_LIBS@ PLUGIN_RPATH= @PLUGIN_RPATH@ diff --git a/libs/console/Makefile.am b/libs/console/Makefile.am index 26a3c6af4..40c3c3a19 100644 --- a/libs/console/Makefile.am +++ b/libs/console/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFconsole.la diff --git a/libs/gamecode/Makefile.am b/libs/gamecode/Makefile.am index cc44a0aff..63f6cb2f9 100644 --- a/libs/gamecode/Makefile.am +++ b/libs/gamecode/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= engine builtins clean-local: diff --git a/libs/gamecode/builtins/Makefile.am b/libs/gamecode/builtins/Makefile.am index 2f399beb6..88f16566f 100644 --- a/libs/gamecode/builtins/Makefile.am +++ b/libs/gamecode/builtins/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFgamecode_builtins.la diff --git a/libs/gamecode/engine/Makefile.am b/libs/gamecode/engine/Makefile.am index aeea03032..867de24ec 100644 --- a/libs/gamecode/engine/Makefile.am +++ b/libs/gamecode/engine/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFgamecode.la diff --git a/libs/gib/Makefile.am b/libs/gib/Makefile.am index 68b621e87..59602850b 100644 --- a/libs/gib/Makefile.am +++ b/libs/gib/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES = libQFgib.la diff --git a/libs/models/Makefile.am b/libs/models/Makefile.am index f584130ab..2624dd1d8 100644 --- a/libs/models/Makefile.am +++ b/libs/models/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= alias brush sprite INCLUDES= -I$(top_srcdir)/include diff --git a/libs/models/alias/Makefile.am b/libs/models/alias/Makefile.am index 8f4b475f5..46a560f59 100644 --- a/libs/models/alias/Makefile.am +++ b/libs/models/alias/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include if BUILD_GL diff --git a/libs/models/brush/Makefile.am b/libs/models/brush/Makefile.am index 8a2804d3a..6a54b0323 100644 --- a/libs/models/brush/Makefile.am +++ b/libs/models/brush/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include if BUILD_GL diff --git a/libs/models/sprite/Makefile.am b/libs/models/sprite/Makefile.am index 38e0595ca..4ecc505cb 100644 --- a/libs/models/sprite/Makefile.am +++ b/libs/models/sprite/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include if BUILD_GL diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index c7a7218c2..420ca57ee 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include lib_LTLIBRARIES= libQFutil.la diff --git a/libs/video/Makefile.am b/libs/video/Makefile.am index 74056321b..f55d5952d 100644 --- a/libs/video/Makefile.am +++ b/libs/video/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= renderer targets clean-local: diff --git a/libs/video/renderer/Makefile.am b/libs/video/renderer/Makefile.am index 7001e173f..fb85ff217 100644 --- a/libs/video/renderer/Makefile.am +++ b/libs/video/renderer/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + SUBDIRS= gl sw sw32 INCLUDES= -I$(top_srcdir)/include diff --git a/libs/video/renderer/gl/Makefile.am b/libs/video/renderer/gl/Makefile.am index 4a8de484e..9da4b4a0b 100644 --- a/libs/video/renderer/gl/Makefile.am +++ b/libs/video/renderer/gl/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include $(GLX_CFLAGS) if BUILD_GL diff --git a/libs/video/renderer/sw/Makefile.am b/libs/video/renderer/sw/Makefile.am index 8447a64a7..4b54e6fd2 100644 --- a/libs/video/renderer/sw/Makefile.am +++ b/libs/video/renderer/sw/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include if ASM_ARCH diff --git a/libs/video/renderer/sw32/Makefile.am b/libs/video/renderer/sw32/Makefile.am index 6d6845fb4..c740fc357 100644 --- a/libs/video/renderer/sw32/Makefile.am +++ b/libs/video/renderer/sw32/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include if BUILD_SW32 diff --git a/libs/video/targets/Makefile.am b/libs/video/targets/Makefile.am index e61ac4cb4..5ade581d6 100644 --- a/libs/video/targets/Makefile.am +++ b/libs/video/targets/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + INCLUDES= -I$(top_srcdir)/include $(GGI_CFLAGS) $(MGL_CFLAGS) $(SDL_CFLAGS) $(SVGA_CFLAGS) $(X_CFLAGS) $(GLIDE_CFLAGS) if ASM_ARCH diff --git a/nq/include/Makefile.am b/nq/include/Makefile.am index 381950c6e..b3c2f0b5f 100644 --- a/nq/include/Makefile.am +++ b/nq/include/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS= foreign + ## Process this file with automake to produce Makefile.in EXTRA_DIST= chase.h client.h conproc.h game.h host.h net.h net_bw.h \ net_dgrm.h net_ipx.h net_loop.h net_mp.h net_udp.h net_vcr.h \ diff --git a/tools/qfdefs/include/Makefile.am b/tools/qfdefs/include/Makefile.am index e69de29bb..9ca505694 100644 --- a/tools/qfdefs/include/Makefile.am +++ b/tools/qfdefs/include/Makefile.am @@ -0,0 +1 @@ +AUTOMAKE_OPTIONS= foreign