From ed404b35b0c900436f2c67aefaf3ead44337e8c0 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Mon, 16 Sep 2002 08:11:44 +0000 Subject: [PATCH] - Wild checkin time! Cleaning up the tree ready for a release. - Added header files to EXTRA_DIST in the relevant directories. - Added the unused source directories to EXTRA_DIST. - Changed -I.. to -I$(top_srcdir)/src for the header files in the module directories. --- Makefile.am | 3 +++ src/Makefile.am | 8 ++++++++ src/baseq2/Makefile.am | 9 ++++++++- src/ctf/Makefile.am | 4 +++- src/rogue/Makefile.am | 10 +++++++++- src/xatrix/Makefile.am | 10 +++++++++- 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5d0d11c..4aef91f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,6 @@ # $Id$ SUBDIRS = libltdl src + +EXTRA_DIST = quake2.dsp quake2.dsw quake2.mak \ + baseq2 bsd docs irix null pixmaps rhapsody solaris win32 diff --git a/src/Makefile.am b/src/Makefile.am index b03ecff..c04554f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,6 +22,14 @@ REF_SOFT_COMMON = r_aclip.c r_alias.c r_bsp.c r_draw.c r_edge.c \ r_sprite.c r_surf.c \ q_shared.c q_sh.c glob.c +EXTRA_DIST = adivtab.h anorms.h anormtab.h asm_draw.h asm_i386.h block8.h \ + block16.h cdaudio.h client.h console.h crc.h d_ifacea.h game.h \ + gcc_attr.h gl_local.h gl_model.h glob.h glw.h input.h keys.h \ + mdfour.h q_shared.h qasm.h qcommon.h qfiles.h qgl.h qmenu.h \ + quakeio.h r_local.h r_model.h rand1k.h ref.h rw.h screen.h \ + server.h snd_loc.h sound.h uint32.h vid.h warpsin.h \ + ref_gl.def ref_gl.dsp ref_soft.def ref_soft.dsp + if ASM_ARCH REF_SOFT_ASM = r_aclipa.S r_draw16.S r_drawa.S r_edgea.S r_scana.S \ r_spr8.S r_surf8.S math.S d_polysa.S r_varsa.S \ diff --git a/src/baseq2/Makefile.am b/src/baseq2/Makefile.am index 75c4270..1ee42bd 100644 --- a/src/baseq2/Makefile.am +++ b/src/baseq2/Makefile.am @@ -16,6 +16,13 @@ game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_svcmds.c g_combat.c \ p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ q_shared.c +EXTRA_DIST = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ + m_boss32.h m_brain.h m_chick.h m_flipper.h m_float.h \ + m_flyer.h m_gladiator.h m_gunner.h m_hover.h m_infantry.h \ + m_insane.h m_medic.h m_mutant.h m_parasite.h m_player.h \ + m_rider.h m_soldier.h m_supertank.h m_tank.h + + AM_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -AM_CPPFLAGS = -I.. +AM_CPPFLAGS = -I$(top_srcdir)/src LDFLAGS = -module -avoid-version -rpath $(pkglibdir) diff --git a/src/ctf/Makefile.am b/src/ctf/Makefile.am index a1cab5c..897520e 100644 --- a/src/ctf/Makefile.am +++ b/src/ctf/Makefile.am @@ -11,6 +11,8 @@ game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_ctf.c \ p_weapon.c \ q_shared.c +EXTRA_DIST = g_ctf.h g_local.h m_player.h p_menu.h + AM_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -AM_CPPFLAGS = -I.. +AM_CPPFLAGS = -I$(top_srcdir)/src LDFLAGS = -module -avoid-version -rpath $(pkglibdir) diff --git a/src/rogue/Makefile.am b/src/rogue/Makefile.am index 452db9c..24bca77 100644 --- a/src/rogue/Makefile.am +++ b/src/rogue/Makefile.am @@ -20,7 +20,15 @@ game_la_SOURCES = dm_ball.c dm_tag.c \ m_tank.c m_turret.c m_widow.c m_widow2.c \ p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ q_shared.c + +EXTRA_DIST = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ + m_boss32.h m_brain.h m_carrier.h m_chick.h m_flipper.h \ + m_float.h m_flyer.h m_gladiator.h m_gunner.h m_hover.h \ + m_infantry.h m_insane.h m_medic.h m_mutant.h m_parasite.h \ + m_player.h m_rider.h m_soldier.h m_stalker.h m_supertank.h \ + m_tank.h m_turret.h m_widow.h m_widow2.h q_shared.h + #game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -game_la_CFLAGS = -I.. -fPIC -pipe @OPT_CFLAGS@ +game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_ROGUE diff --git a/src/xatrix/Makefile.am b/src/xatrix/Makefile.am index c7926c7..6b4b5b6 100644 --- a/src/xatrix/Makefile.am +++ b/src/xatrix/Makefile.am @@ -17,7 +17,15 @@ game_la_SOURCES = g_ai.c g_chase.c g_cmds.c g_combat.c g_func.c \ m_parasite.c m_soldier.c m_supertank.c m_tank.c \ p_client.c p_hud.c p_trail.c p_view.c p_weapon.c \ q_shared.c + +EXTRA_DIST = g_local.h m_actor.h m_berserk.h m_boss2.h m_boss31.h \ + m_boss32.h m_brain.h m_chick.h m_fixbot.h m_flipper.h \ + m_float.h m_flyer.h m_gekk.h m_gladiator.h m_gunner.h \ + m_hover.h m_infantry.h m_insane.h m_medic.h m_mutant.h \ + m_parasite.h m_player.h m_rider.h m_soldier.h m_soldierh.h \ + m_supertank.h m_tank.h q_shared.h + #game_la_CFLAGS = -fPIC -Wall -Werror -pipe @OPT_CFLAGS@ -game_la_CFLAGS = -I.. -fPIC -pipe @OPT_CFLAGS@ +game_la_CFLAGS = -I$(top_srcdir)/src -fPIC -pipe @OPT_CFLAGS@ game_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) endif # DO_XATRIX