make dist fixups

2024-11-10 15:22:04 +00:00 · 2001-05-22 17:09:03 +00:00 · 2001-05-22 17:09:03 +00:00 · c500fd7479
commit c500fd7479
parent abd7d79d6b
11 changed files with 61 additions and 30 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS= foreign

-SUBDIRS=	include libs qw nq
+SUBDIRS=	debian doc include libs qw nq

 EXTRA_DIST=	ChangeLog RPM/build_rpm.in \
 		tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
--- a/configure.in
+++ b/configure.in
@ -1532,6 +1532,7 @@ AC_OUTPUT(

 	include/Makefile
 	include/QF/Makefile
+	include/QF/plugin/Makefile
 	include/win32/version.h

 	libs/Makefile
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,12 +1,21 @@
-EXTRA_DIST=	3dfx.txt Makefile data glqnotes.txt makefile.linuxi386 \
-		makefile.solaris progdefs.q1 progdefs.q2 qe3.ico quake.gif \
-		quake.ico readme.solaris wqreadme.txt \
-		\
-		data/comexp.txt data/help.txt data/licinfo.txt data/manual.txt \
-		data/order.txt data/readme.txt data/rlicnse.txt \
-		data/slicnse.txt data/techinfo.txt \
-		\
-		data/docs/install data/docs/install.q2mission \
-		data/docs/install.quake data/docs/install.quake2 \
-		data/docs/readme data/docs/readme.glquake \
-		data/docs/readme.squake data/docs/readme.x11
+SUBDIRS= man texinfo
+EXTRA_DIST= 3dfx.txt CodingStyle cvarlist.txt glqnotes.txt makefile.linuxi386 \
+	makefile.solaris net_DoS_protection.txt progdefs.q1 progdefs.q2 \
+	qe3.ico qf-client-3dfx-cvar.txt qf-client-glx-cvar.txt \
+	qf-client-sdl-cvar.txt qf-client-sgl-cvar.txt qf-client-svga-cvar.txt \
+	qf-client-x11-cmd.txt qf-client-x11-cvar.txt qf-server-cmd.txt \
+	qf-server-cvar.txt quake.gif quake.ico readme.solaris readme.txt \
+	skybox.fig template.h timestamps.txt wqreadme.txt \
+	\
+	config/glspeed-v1.cfg config/glspeed-v3.cfg config/swspeed.cfg \
+	\
+	data/comexp.txt \
+	\
+	data/help.txt data/licinfo.txt data/manual.txt data/order.txt \
+	data/readme.txt data/rlicnse.txt data/slicnse.txt data/techinfo.txt \
+	\
+	data/docs/install data/docs/install.q2mission \
+	data/docs/install.quake data/docs/install.quake2 data/docs/readme \
+	data/docs/readme.glquake data/docs/readme.squake data/docs/readme.x11 \
+	\
+	ideas/quakedownload.txt ideas/rhamph.txt ideas/serverlist.txt
--- a/include/Makefile.am
+++ b/include/Makefile.am
@ -1,4 +1,21 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = QF
-EXTRA_DIST = fbset.h in_win.h view.h winquake.h
+EXTRA_DIST = adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h block8.h \
+	buildnum.h context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h \
+	dosisms.h fbset.h gib_error.h gib_instructions.h gib_interpret.h \
+	gib_modules.h gib_parse.h gib_stack.h gib_vars.h gl_warp_sin.h \
+	glquake.h in_win.h logos.h menu.h mpdosock.h quakeasm.h r_cvar.h \
+	r_dynamic.h r_local.h r_shared.h sbar.h stamp-h.in vgamodes.h \
+	vid_dos.h view.h vregset.h winquake.h \
+	\
+	win32/bc/borland.c win32/bc/config.h \
+	\
+	win32/fnmatch.h \
+	\
+	win32/mingw/config.h \
+	\
+	win32/resources/icon1.ico win32/resources/quakeforge.rc \
+	win32/resources/resource.h \
+	\
+	win32/vc/config.h win32/vc/dirent.h win32/version.h win32/version.h.in
--- a/include/QF/Makefile.am
+++ b/include/QF/Makefile.am
@ -1,8 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
+SUBDIRS = plugin
 includedir = $(prefix)/include/QF
-include_HEADERS =	asm_i386.h checksum.h cmd.h compat.h \
-			console.h crc.h cvar.h gcc_attr.h hash.h info.h \
-			keys.h link.h mathlib.h mdfour.h msg.h pr_comp.h \
-			progs.h qargs.h qdefs.h qendian.h qfplist.h qtypes.h \
-			quakefs.h quakeio.h sizebuf.h sys.h uint32.h \
-			va.h ver_check.h zone.h
+include_HEADERS = asm_i386.h bspfile.h cdaudio.h checksum.h cmd.h compat.h \
+	console.h crc.h cvar.h draw.h gcc_attr.h gib.h hash.h hl.h info.h \
+	input.h joystick.h keys.h link.h locs.h mathlib.h mdfour.h model.h \
+	modelgen.h msg.h pcx.h plugin.h pr_comp.h progs.h qargs.h qdefs.h \
+	qendian.h qfgl_ext.h qfplist.h qtypes.h quakefs.h quakeio.h render.h \
+	screen.h sizebuf.h skin.h sound.h spritegn.h sys.h teamplay.h \
+	texture.h tga.h uint32.h va.h varrays.h ver_check.h vid.h wad.h \
+	zone.h
--- a/include/QF/plugin/.gitignore
+++ b/include/QF/plugin/.gitignore
@ -0,0 +1,3 @@
+.vimrc
+Makefile
+Makefile.in
--- a/include/QF/plugin/Makefile.am
+++ b/include/QF/plugin/Makefile.am
@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS = foreign
+includedir = $(prefix)/include/QF/plugin
+include_HEADERS = general.h input.h sound.h
--- a/libs/audio/targets/Makefile.am
+++ b/libs/audio/targets/Makefile.am
@ -1,14 +1,13 @@
 INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS)

 pkglib_LTLIBRARIES = @SND_PLUGIN_TARGETS@ libsound_null.la libsound_disk.la
-EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_mme.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la
+EXTRA_LTLIBRARIES = libsound_sdl.la libsound_alsa0_5.la libsound_alsa0_9.la libsound_oss.la libsound_sgi.la libsound_sun.la libsound_win.la

 common_sound_files= snd_dma.c snd_mem.c snd_mix.c snd_mixa.S

 libsound_sdl_la_LDFLAGS= -version-info 1:0:0 $(SDL_LIBS)
 libsound_alsa0_5_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS)
 libsound_alsa0_9_la_LDFLAGS= -version-info 1:0:0 $(ALSA_LIBS)
-libsound_mme_la_LDFLAGS= -version-info 1:0:0 $(MME_LIBS)
 libsound_oss_la_LDFLAGS= -version-info 1:0:0 $(OSS_LIBS)
 libsound_sgi_la_LDFLAGS= -version-info 1:0:0 $(SGISND_LIBS)
 libsound_sun_la_LDFLAGS= -version-info 1:0:0 $(SUN_LIBS)
@ -28,10 +27,6 @@ libsound_alsa0_9_la_SOURCES= $(common_sound_files) snd_alsa_0_9.c
 libsound_alsa0_9.la: $(libsound_alsa0_9_la_OBJECTS) $(libsound_alsa0_9_la_DEPENDENCIES)
 	$(LINK) -rpath $(pluginpath) $(libsound_alsa0_9_la_LDFLAGS) $(libsound_alsa0_9_la_OBJECTS) $(libsound_alsa0_9_la_LIBADD) $(LIBS)

-libsound_mme_la_SOURCES= $(common_sound_files) snd_mme.c
-libsound_mme.la: $(libsound_mme_la_OBJECTS) $(libsound_mme_la_DEPENDENCIES)
-	$(LINK) -rpath $(pluginpath) $(libsound_mme_la_LDFLAGS) $(libsound_mme_la_OBJECTS) $(libsound_mme_la_LIBADD) $(LIBS)
-
 libsound_oss_la_SOURCES= $(common_sound_files) snd_oss.c
 libsound_oss.la: $(libsound_oss_la_OBJECTS) $(libsound_oss_la_DEPENDENCIES)
 	$(LINK) -rpath $(pluginpath) $(libsound_oss_la_LDFLAGS) $(libsound_oss_la_OBJECTS) $(libsound_oss_la_LIBADD) $(LIBS)
--- a/libs/video/targets/Makefile.am
+++ b/libs/video/targets/Makefile.am
@ -25,7 +25,7 @@ YACCLEX_CLEANFILES=	fbset_modes_y.c fbset_modes_y.h \
 libQFfbdev_la_LDFLAGS=	-version-info 1:0:0
 libQFfbdev_la_SOURCES=	fbset.c fbset_modes_y.y fbset_modes_l.l \
 			in_common.c in_fbdev.c vid.c vid_common_sw.c vid_fbdev.c
-#EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
+EXTRA_libQFfbdev_la_SOURCES=fbset_modes_y.h
 libQFfbdev.la: $(libQFfbdev_la_OBJECTS) $(libQFfbdev_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libQFfbdev_la_LDFLAGS) $(libQFfbdev_la_OBJECTS) $(libQFfbdev_la_LIBADD) $(LIBS)
 fbset_modes_y.lo: $(srcdir)/fbset_modes_y.c
--- a/nq/include/Makefile.am
+++ b/nq/include/Makefile.am
@ -3,5 +3,5 @@ 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_ser.h net_udp.h \
 		net_vcr.h net_wins.h net_wipx.h progdefs.h progdefs.q1 \
-		progdefs.q2 protocol.h r_dynamic.h render.h \
+		progdefs.q2 protocol.h \
 		server.h sv_pr_cmds.h sv_progs.h world.h
--- a/qw/include/Makefile.am
+++ b/qw/include/Makefile.am
@ -2,8 +2,8 @@
 AUTOMAKE_OPTIONS=	foreign

 EXTRA_DIST =	bothdefs.h cl_cam.h cl_demo.h cl_ents.h cl_input.h \
-		cl_main.h cl_parse.h cl_pred.h cl_slist.h cl_tent.h client.h \
+		cl_main.h cl_parse.h cl_pred.h cl_skin.h cl_slist.h cl_tent.h client.h \
 		game.h host.h \
 		msg_ucmd.h net.h pmove.h progdefs.h \
-		protocol.h r_dynamic.h render.h server.h \
+		protocol.h server.h \
 		sv_pr_cmds.h sv_progs.h world.h