From 9cd83e178f786e9f936610318d1db665e33e997e Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 11 Apr 2001 03:09:24 +0000 Subject: [PATCH] various fixes for out-of-srcdir building configure.in: foo/Makefile MUST come before foo/bar/Makefile or foo/bar will NOT be created. libs/*...*/Mkaefile.am: add INCLUDES so $(top_scrdir)/include gets searched {qw,nq}/source/Makefile.am: fix fbset compiling (and cleaning for nq) --- configure.in | 27 +++++++++++++++++---------- libs/audio/cd/Makefile.am | 2 ++ libs/audio/targets/Makefile.am | 2 ++ libs/util/Makefile.am | 2 ++ nq/source/Makefile.am | 7 +++++-- qw/source/Makefile.am | 4 ++-- 6 files changed, 30 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in index 2c1d896b6..7efd83bac 100644 --- a/configure.in +++ b/configure.in @@ -1426,30 +1426,37 @@ AC_SUBST(QW_TARGETS) dnl Output files AC_OUTPUT( - RPM/build_rpm - debian/Makefile - doc/Makefile - doc/texinfo/Makefile - doc/man/Makefile + Makefile + include/Makefile include/QF/Makefile include/win32/version.h + libs/Makefile libs/audio/Makefile libs/audio/cd/Makefile libs/audio/targets/Makefile libs/gamecode/Makefile libs/util/Makefile - qw/include/Makefile - qw/source/Makefile + qw/Makefile qw/quakeforge.lsm - Makefile + qw/include/Makefile + qw/source/Makefile + nq/Makefile + nq/nuq.lsm nq/include/Makefile nq/source/Makefile - nq/Makefile - nq/nuq.lsm, + + doc/Makefile + doc/man/Makefile + doc/texinfo/Makefile + + debian/Makefile + + RPM/build_rpm, + chmod +x RPM/build_rpm ) diff --git a/libs/audio/cd/Makefile.am b/libs/audio/cd/Makefile.am index 30e12b04a..67d46282d 100644 --- a/libs/audio/cd/Makefile.am +++ b/libs/audio/cd/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES= -I$(top_srcdir)/include + lib_LTLIBRARIES = libQFcd.la libQFcd_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS) diff --git a/libs/audio/targets/Makefile.am b/libs/audio/targets/Makefile.am index 2e6ecdb1f..0bcefc502 100644 --- a/libs/audio/targets/Makefile.am +++ b/libs/audio/targets/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES= -I$(top_srcdir)/include + lib_LTLIBRARIES = libQFsound.la libQFsound_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS) diff --git a/libs/util/Makefile.am b/libs/util/Makefile.am index 36ae02abc..87c215c46 100644 --- a/libs/util/Makefile.am +++ b/libs/util/Makefile.am @@ -1,3 +1,5 @@ +INCLUDES= -I$(top_srcdir)/include + lib_LTLIBRARIES = libQFutil.la libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) diff --git a/nq/source/Makefile.am b/nq/source/Makefile.am index ed2c5a8f5..f3437b20e 100644 --- a/nq/source/Makefile.am +++ b/nq/source/Makefile.am @@ -124,9 +124,9 @@ YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h fbset_modes_y.tab.h fbset_mo EXTRA_nq_fbdev_SOURCES=fbset_modes_y.h fbset_modes_y.o: fbset_modes_y.c - $(CC) $(INCLUDES) $(CFLAGS) -Wno-error -c fbset_modes_y.c + $(COMPILE) -Wno-error -c fbset_modes_y.c fbset_modes_l.o: fbset_modes_l.c - $(CC) $(INCLUDES) $(CFLAGS) -Wno-error -c fbset_modes_l.c + $(COMPILE) -Wno-error -c fbset_modes_l.c nq_fbdev_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(fbdev_SOURCES) nq_fbdev_LDADD= $(client_LIBS) @@ -229,3 +229,6 @@ nq_server_DEPENDENCIES=libqfnet.a # or it won't be distributed with 'make dist' # EXTRA_DIST= #nq.dsp + +# Kill the temp files, hopefully. +CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES) diff --git a/qw/source/Makefile.am b/qw/source/Makefile.am index 944aa991c..ada336630 100644 --- a/qw/source/Makefile.am +++ b/qw/source/Makefile.am @@ -162,9 +162,9 @@ YACCLEX_CLEANFILES= fbset_modes_y.c fbset_modes_y.h fbset_modes_y.tab.h fbset_mo EXTRA_qw_client_fbdev_SOURCES=fbset_modes_y.h fbset_modes_y.o: fbset_modes_y.c - $(CC) $(INCLUDES) $(CFLAGS) -Wno-error -c fbset_modes_y.c + $(COMPILE) -Wno-error -c fbset_modes_y.c fbset_modes_l.o: fbset_modes_l.c - $(CC) $(INCLUDES) $(CFLAGS) -Wno-error -c fbset_modes_l.c + $(COMPILE) -Wno-error -c fbset_modes_l.c qw_client_fbdev_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(fbdev_SOURCES) qw_client_fbdev_LDADD= $(CLIENT_LIBS)