qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-05-31 16:51:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

various fixes for out-of-srcdir building

Browse source 
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)
This commit is contained in:
Bill Currie 2001-04-11 03:09:24 +00:00
parent 0f98bc01be
commit 9cd83e178f
6 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
configure.in
View file

@ -1426,30 +1426,37 @@ AC_SUBST(QW_TARGETS)
dnl Output files dnl Output files
AC_OUTPUT( AC_OUTPUT(
RPM/build_rpm Makefile
debian/Makefile
doc/Makefile
doc/texinfo/Makefile
doc/man/Makefile
include/Makefile include/Makefile
include/QF/Makefile include/QF/Makefile
include/win32/version.h include/win32/version.h
libs/Makefile libs/Makefile
libs/audio/Makefile libs/audio/Makefile
libs/audio/cd/Makefile libs/audio/cd/Makefile
libs/audio/targets/Makefile libs/audio/targets/Makefile
libs/gamecode/Makefile libs/gamecode/Makefile
libs/util/Makefile libs/util/Makefile
qw/include/Makefile
qw/source/Makefile
qw/Makefile qw/Makefile
qw/quakeforge.lsm qw/quakeforge.lsm
Makefile qw/include/Makefile
qw/source/Makefile
nq/Makefile
nq/nuq.lsm
nq/include/Makefile nq/include/Makefile
nq/source/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 chmod +x RPM/build_rpm
) )

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

@ -1,3 +1,5 @@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFcd.la lib_LTLIBRARIES = libQFcd.la
libQFcd_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS) libQFcd_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS)

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

@ -1,3 +1,5 @@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFsound.la lib_LTLIBRARIES = libQFsound.la
libQFsound_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS) libQFsound_la_LDFLAGS = -version-info 1:0:0 $(CD_LIBS)

2
libs/util/Makefile.am
View file

@ -1,3 +1,5 @@
INCLUDES= -I$(top_srcdir)/include
lib_LTLIBRARIES = libQFutil.la lib_LTLIBRARIES = libQFutil.la
libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS) libQFutil_la_LDFLAGS = -version-info 1:0:0 $(Z_LIBS)

7
nq/source/Makefile.am
View file

@ -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 EXTRA_nq_fbdev_SOURCES=fbset_modes_y.h
fbset_modes_y.o: fbset_modes_y.c 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 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_SOURCES= $(combined_SOURCES) $(soft_SOURCES) $(fbdev_SOURCES)
nq_fbdev_LDADD= $(client_LIBS) nq_fbdev_LDADD= $(client_LIBS)
@ -229,3 +229,6 @@ nq_server_DEPENDENCIES=libqfnet.a
# or it won't be distributed with 'make dist' # or it won't be distributed with 'make dist'
# #
EXTRA_DIST= #nq.dsp EXTRA_DIST= #nq.dsp
# Kill the temp files, hopefully.
CLEANFILES = *.i *.s $(YACCLEX_CLEANFILES)

4
qw/source/Makefile.am
View file

@ -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 EXTRA_qw_client_fbdev_SOURCES=fbset_modes_y.h
fbset_modes_y.o: fbset_modes_y.c 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 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_SOURCES= $(common_SOURCES) $(client_SOURCES) $(soft_SOURCES) $(fbdev_SOURCES)
qw_client_fbdev_LDADD= $(CLIENT_LIBS) qw_client_fbdev_LDADD= $(CLIENT_LIBS)