From 314338e8166db7e4fe45fbdf807a73aca0e90635 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 24 Jan 2001 11:11:07 +0000 Subject: [PATCH] improved automake config. make dist, VPATH builds, ... --- 2d/Makefile.am | 4 ++ 3d/Makefile.am | 4 ++ Makefile.am | 18 ++++++-- acconfig.h | 54 ++++++++++++++++++++++ arch/Makefile.am | 6 +++ arch/dos/Makefile.am | 28 ++++-------- arch/dos/allg_snd/Makefile.am | 5 +++ arch/dos/allg_snd/sound/Makefile.am | 6 +++ arch/dos/allg_snd/sound/drv/Makefile.am | 3 ++ arch/dos/bak/Makefile.am | 2 + arch/dos/comm/Makefile.am | 5 +++ arch/dos/comm/include/Makefile.am | 3 ++ arch/dos/include/Makefile.am | 2 + arch/dos/mm_snd/Makefile.am | 5 +++ arch/dos/mm_snd/include/Makefile.am | 2 + arch/linux/Makefile.am | 14 +++--- arch/linux/include/Makefile.am | 3 ++ arch/linux/svgalib/Makefile.am | 4 ++ arch/linux/svgalib/include/Makefile.am | 2 + arch/ogl/Makefile.am | 1 + arch/ogl/include/Makefile.am | 2 + arch/sdl/Makefile.am | 6 +-- arch/win32/Makefile.am | 8 ++++ arch/win32/d3dframe/Makefile.am | 5 +++ arch/win32/include/Makefile.am | 3 ++ autogen.sh | 1 + cfile/Makefile.am | 3 ++ conf.h.in | 31 ++++++++----- configure.in | 60 +++++++++++++++++++++---- iff/Makefile.am | 2 + iff/archive/Makefile.am | 2 + include/Makefile.am | 10 +++++ input/Makefile.am | 11 ++++- input/ggi/Makefile.am | 7 ++- input/ggi/include/Makefile.am | 2 + input/linux/Makefile.am | 8 ++-- input/linux/include/Makefile.am | 2 + input/sdl/Makefile.am | 8 ++-- input/sdl/include/Makefile.am | 2 + input/svgalib/Makefile.am | 1 + input/svgalib/include/Makefile.am | 2 + main/Makefile.am | 17 +++++++ main/editor/Makefile.am | 2 + main/old/Makefile.am | 5 +++ maths/Makefile.am | 4 ++ misc/Makefile.am | 3 ++ sound/Makefile.am | 4 +- texmap/Makefile.am | 6 +++ unused/Makefile.am | 4 ++ unused/bios/Makefile.am | 10 +++++ unused/lib/Makefile.am | 2 + unused/novga/Makefile.am | 3 ++ unused/pa_null/Makefile.am | 3 ++ unused/ui/Makefile.am | 6 +++ unused/vga/Makefile.am | 9 ++++ unused/vga/new/Makefile.am | 2 + unused/win95/Makefile.am | 8 ++++ video/Makefile.am | 7 ++- 58 files changed, 368 insertions(+), 74 deletions(-) create mode 100644 acconfig.h create mode 100644 arch/dos/allg_snd/Makefile.am create mode 100644 arch/dos/allg_snd/sound/Makefile.am create mode 100644 arch/dos/allg_snd/sound/drv/Makefile.am create mode 100644 arch/dos/bak/Makefile.am create mode 100644 arch/dos/comm/Makefile.am create mode 100644 arch/dos/comm/include/Makefile.am create mode 100644 arch/dos/include/Makefile.am create mode 100644 arch/dos/mm_snd/Makefile.am create mode 100644 arch/dos/mm_snd/include/Makefile.am create mode 100644 arch/linux/include/Makefile.am create mode 100644 arch/linux/svgalib/Makefile.am create mode 100644 arch/linux/svgalib/include/Makefile.am create mode 100644 arch/ogl/Makefile.am create mode 100644 arch/ogl/include/Makefile.am create mode 100644 arch/win32/Makefile.am create mode 100644 arch/win32/d3dframe/Makefile.am create mode 100644 arch/win32/include/Makefile.am create mode 100644 iff/archive/Makefile.am create mode 100644 include/Makefile.am create mode 100644 input/ggi/include/Makefile.am create mode 100644 input/linux/include/Makefile.am create mode 100644 input/sdl/include/Makefile.am create mode 100644 input/svgalib/Makefile.am create mode 100644 input/svgalib/include/Makefile.am create mode 100644 main/editor/Makefile.am create mode 100644 main/old/Makefile.am create mode 100644 unused/Makefile.am create mode 100644 unused/bios/Makefile.am create mode 100644 unused/lib/Makefile.am create mode 100644 unused/novga/Makefile.am create mode 100644 unused/pa_null/Makefile.am create mode 100644 unused/ui/Makefile.am create mode 100644 unused/vga/Makefile.am create mode 100644 unused/vga/new/Makefile.am create mode 100644 unused/win95/Makefile.am diff --git a/2d/Makefile.am b/2d/Makefile.am index 8356c382..076456f2 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -14,3 +14,7 @@ if USE_ASM lib2d_a_LIBADD += linear.o tmerge_a.o endif +EXTRA_DIST = \ +linear.asm scalea.asm tmerge_a.asm \ +bitmap.h clip.h linear.h scalea.h \ +scale.c diff --git a/3d/Makefile.am b/3d/Makefile.am index c4bbfd7f..fcdb3ff5 100644 --- a/3d/Makefile.am +++ b/3d/Makefile.am @@ -4,3 +4,7 @@ INCLUDES = -I $(top_srcdir)/includes lib3d_a_SOURCES = \ clipper.c globvars.c interp.c points.c setup.c \ draw.c instance.c matrix.c rod.c + +EXTRA_DIST = \ +interp.asm \ +clipper.h globvars.h diff --git a/Makefile.am b/Makefile.am index e707d25c..dbdf8d74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,17 @@ -SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main +SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main \ +includes tools unused + +changelog:: + -touch ChangeLog + -tools/cvs2cl/cvs2cl.pl -b --utc + -rm -f ChangeLog.bak ## to automatically rebuild aclocal.m4 if any of the macros in ## `macros/' change -@MAINT@include macros/macros.dep -@MAINT@macros/macros.dep: macros/Makefile.am -@MAINT@ cd macros && $(MAKE) macros.dep +#@MAINT@include macros/macros.dep +#@MAINT@macros/macros.dep: macros/Makefile.am +#@MAINT@ cd macros && $(MAKE) macros.dep + +EXTRA_DIST = \ +djgpp.bat djgpp.sh \ +cvshowto.txt readme.txt diff --git a/acconfig.h b/acconfig.h new file mode 100644 index 00000000..304ba9a6 --- /dev/null +++ b/acconfig.h @@ -0,0 +1,54 @@ +/* Define if you want an assembler free build */ +#undef NO_ASM + +/* Define if you want a network build */ +#undef NETWORK + +/* Define if you want an OpenGL build */ +#undef OGL + +/* Define if you want an SVGALib build */ +#undef SVGA + +/* Define if you want a GGI build */ +#undef GGI + +/* Define if building under linux */ +#undef __ENV_LINUX__ + +/* Define if building under msdos */ +#undef __ENV_DJGPP__ + +/* Define to disable asserts, int3, etc. */ +#undef NDEBUG + +@BOTTOM@ + +/* General defines */ +#define NMONO 1 +#define PIGGY_USE_PAGING 1 +#define NEWDEMO 1 + +#ifdef __ENV_LINUX__ +# define __SDL__ 1 +# define SDL_AUDIO 1 + +# ifdef OGL +# define GLX_VIDEO 1 +# define GII_INPUT 1 +# define GII_XWIN 1 +# else +# ifdef GGI +# define GGI_VIDEO 1 +# define GII_INPUT 1 +# else +# ifdef SVGA +# define SVGALIB_VIDEO 1 +# define SVGALIB_INPUT 1 +# else +# define SDL_VIDEO 1 +# define SDL_INPUT 1 +# endif +# endif +# endif +#endif diff --git a/arch/Makefile.am b/arch/Makefile.am index b13cabe6..9787f057 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = dos linux ogl sdl win32 + noinst_LIBRARIES = libarch.a INCLUDES = -I $(top_srcdir)/includes -I $(top_srcdir)/main @@ -14,3 +16,7 @@ SUFFIXES = .asm if ENV_DJGPP libarch_a_LIBADD += dos_timer.o dos_modex.o endif + +EXTRA_DIST = \ +dos_tweak.inc dos_vgaregs.inc \ +dos_modex.asm dos_timer.asm diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am index 80b046e4..e1000169 100644 --- a/arch/dos/Makefile.am +++ b/arch/dos/Makefile.am @@ -1,20 +1,8 @@ -if ENV_DJGPP - -noinst_LIBRARIES = libarchdos.a -INCLUDES = -I $(top_srcdir)/includes -Iinclude -I $(top_srcdir)/main -I$(top_srcdir)/input/sdl/include - -libarchdos_a_SOURCES = init.c dpmi.c findfile.c vesa.c - - -if USE_ASM - SUFFIXES = .asm - %.o: %.asm - $(NASM) $(NASMFLAGS) $< -o $@ - - libarchdos_a_SOURCES += timer.asm modex.asm - libarchdos_a_LIBADD += timer.o modex.o - init.c: timer.o modex.o -endif - - -endif +SUBDIRS = allg_snd bak comm include mm_snd + +EXTRA_DIST = \ +joy2.asm modex.asm timer.asm \ +tweak.inc vgaregs.inc \ +ipx.h mono.h \ +bcd.c cdrom.c digi.c digiallg.c digimm.c disk.c dosgr.c dpmi.c findfile.c \ +init.c ipx.c joyc.c joydefs.c key.c midiallg.c mono.c mouse.c serial.c vesa.c diff --git a/arch/dos/allg_snd/Makefile.am b/arch/dos/allg_snd/Makefile.am new file mode 100644 index 00000000..915f313a --- /dev/null +++ b/arch/dos/allg_snd/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = sound + +EXTRA_DIST = \ +internal.h \ +allg_snd.c diff --git a/arch/dos/allg_snd/sound/Makefile.am b/arch/dos/allg_snd/sound/Makefile.am new file mode 100644 index 00000000..b5bd20e2 --- /dev/null +++ b/arch/dos/allg_snd/sound/Makefile.am @@ -0,0 +1,6 @@ +SUBDIRS = drv + +EXTRA_DIST = \ +readme.d1 readme.txt \ +allegro.h interndj.h \ +config.c digmid.c midi.c mixer.c snddrv.c sound.c diff --git a/arch/dos/allg_snd/sound/drv/Makefile.am b/arch/dos/allg_snd/sound/drv/Makefile.am new file mode 100644 index 00000000..a84bde46 --- /dev/null +++ b/arch/dos/allg_snd/sound/drv/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +emu8k.h fm_instr.h \ +adlib.c awedata.c dma.c emu8k.c emu8kmid.c gus.c mpu.c sb.c diff --git a/arch/dos/bak/Makefile.am b/arch/dos/bak/Makefile.am new file mode 100644 index 00000000..56a9f620 --- /dev/null +++ b/arch/dos/bak/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +ipx.c diff --git a/arch/dos/comm/Makefile.am b/arch/dos/comm/Makefile.am new file mode 100644 index 00000000..889e33a5 --- /dev/null +++ b/arch/dos/comm/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = include + +EXTRA_DIST = \ +irqwrap.S \ +commlib.c dzcomm.c dzqueue.c irq.c diff --git a/arch/dos/comm/include/Makefile.am b/arch/dos/comm/include/Makefile.am new file mode 100644 index 00000000..3992b967 --- /dev/null +++ b/arch/dos/comm/include/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +asmdef.inc asmdefs.inc \ +allegro.h commlib.h internal.h diff --git a/arch/dos/include/Makefile.am b/arch/dos/include/Makefile.am new file mode 100644 index 00000000..8bd8a52a --- /dev/null +++ b/arch/dos/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +commlib.h disk.h dzcomm.h joy.h key.h midiallg.h mouse.h serial.h diff --git a/arch/dos/mm_snd/Makefile.am b/arch/dos/mm_snd/Makefile.am new file mode 100644 index 00000000..c88a2ef0 --- /dev/null +++ b/arch/dos/mm_snd/Makefile.am @@ -0,0 +1,5 @@ +SUBDIRS = include + +EXTRA_DIST = \ +readme.txt \ +drv_sb.c mdma.c mirq.c diff --git a/arch/dos/mm_snd/include/Makefile.am b/arch/dos/mm_snd/include/Makefile.am new file mode 100644 index 00000000..c4695e25 --- /dev/null +++ b/arch/dos/mm_snd/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +mdma.h mikmod.h mirq.h mm_drv.h mmio.h mtypes.h diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index 4c991cae..e3910cb5 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -1,10 +1,6 @@ -ifndef ENV_DJGPP +SUBDIRS = svgalib include -noinst_LIBRARIES = libarchlinux.a -INCLUDES = -I $(top_srcdir)/includes -I../../input/sdl/include -I../../input/linux/include -I $(top_srcdir)/main -Iinclude - -libarchlinux_a_SOURCES = \ -init.c ipx_lin.c \ -ipx_bsd.c ipx_udp.c linuxnet.c findfile.c - -endif +EXTRA_DIST = \ +alsadigi.c findfile.c hmiplay.c hmistub.c init.c \ +ipx_bsd.c ipx_kali.c ipx_lin.c ipx_udp.c \ +linuxnet.c mono.c serial.c timer.c ukali.c diff --git a/arch/linux/include/Makefile.am b/arch/linux/include/Makefile.am new file mode 100644 index 00000000..4686107b --- /dev/null +++ b/arch/linux/include/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +ipx_bsd.h ipx_drv.h ipx_hlpr.h ipx_kali.h ipx_ld.h ipx_lin.h ipx_udp.h \ +music.h serial.h ukali.h diff --git a/arch/linux/svgalib/Makefile.am b/arch/linux/svgalib/Makefile.am new file mode 100644 index 00000000..804a83b3 --- /dev/null +++ b/arch/linux/svgalib/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = include + +EXTRA_DIST = \ +event.c gr.c init.c key.c mouse.c diff --git a/arch/linux/svgalib/include/Makefile.am b/arch/linux/svgalib/include/Makefile.am new file mode 100644 index 00000000..1b9c30c0 --- /dev/null +++ b/arch/linux/svgalib/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +event.h key.h mouse.h diff --git a/arch/ogl/Makefile.am b/arch/ogl/Makefile.am new file mode 100644 index 00000000..7b92e00e --- /dev/null +++ b/arch/ogl/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = include diff --git a/arch/ogl/include/Makefile.am b/arch/ogl/include/Makefile.am new file mode 100644 index 00000000..47825bfe --- /dev/null +++ b/arch/ogl/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +loadgl.h ogl_init.h diff --git a/arch/sdl/Makefile.am b/arch/sdl/Makefile.am index 23a16a3e..ae50d58e 100644 --- a/arch/sdl/Makefile.am +++ b/arch/sdl/Makefile.am @@ -1,4 +1,2 @@ -noinst_LIBRARIES = libarchsdl.a -INCLUDES = -I $(top_srcdir)/includes -Iinclude -I $(top_srcdir)/main -I$(top_srcdir)/input/sdl/include - -libarchsdl_a_SOURCES = init.c timer.c +EXTRA_DIST = \ +init.c timer.c diff --git a/arch/win32/Makefile.am b/arch/win32/Makefile.am new file mode 100644 index 00000000..a609f8ab --- /dev/null +++ b/arch/win32/Makefile.am @@ -0,0 +1,8 @@ +SUBDIRS = d3dframe include + +EXTRA_DIST = \ +d1x.ico d3d.ico descent.ico d1x.rc \ +ipx_drv.h \ +debug.cpp pch.cpp scene.cpp texture.cpp winmain.cpp \ +digi.c glinit.c gr.c hmpfile.c init.c ipx_win.c joydefs.c joyhh.c \ +key.c mono.c mouse.c palw32.c serial.c timer.c win32.c winnet.c diff --git a/arch/win32/d3dframe/Makefile.am b/arch/win32/d3dframe/Makefile.am new file mode 100644 index 00000000..25ada097 --- /dev/null +++ b/arch/win32/d3dframe/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ +d3denum.h d3dframe.h d3dmath.h d3dtextr.h d3dutil.h \ +ddmm.h ddutil.h ddutil2.h dsutil.h lbprintf.h resource.h \ +d3denum.cpp d3dframe.cpp d3dmath.cpp d3dtextr.cpp d3dutil.cpp \ +ddenum.cpp userdlg.cpp diff --git a/arch/win32/include/Makefile.am b/arch/win32/include/Makefile.am new file mode 100644 index 00000000..bd8f6a03 --- /dev/null +++ b/arch/win32/include/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +d3dhelp.h debug.h hmpfile.h joy.h key.h mouse.h pch.h \ +resource.h scene.h serial.h texture.h winmain.h wsipx.h diff --git a/autogen.sh b/autogen.sh index daf094af..5fed1ba2 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,6 @@ #!/bin/sh aclocal +autoheader automake --add-missing autoconf ./configure "$@" diff --git a/cfile/Makefile.am b/cfile/Makefile.am index e1e0391f..23440b3f 100644 --- a/cfile/Makefile.am +++ b/cfile/Makefile.am @@ -2,3 +2,6 @@ noinst_LIBRARIES = libcfile.a INCLUDES = -I $(top_srcdir)/includes libcfile_a_SOURCES = cfile.c + +EXTRA_DIST = \ +nocfile.h diff --git a/conf.h.in b/conf.h.in index 45efa70a..2e2374de 100644 --- a/conf.h.in +++ b/conf.h.in @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* conf.h.in. Generated automatically from configure.in by autoheader. */ /* Define if you need to in order for stat and other things to work. */ #undef _POSIX_SOURCE @@ -6,9 +6,6 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define if you have netipx/ipx.h */ -#undef HAVE_NETIPX_IPX_H - /* Define if you want an assembler free build */ #undef NO_ASM @@ -33,13 +30,23 @@ /* Define to disable asserts, int3, etc. */ #undef NDEBUG +/* Define if you have the header file. */ +#undef HAVE_NETIPX_IPX_H + +/* Name of package */ +#undef PACKAGE + +/* Version number of package */ +#undef VERSION + + /* General defines */ #define NMONO 1 #define PIGGY_USE_PAGING 1 #define NEWDEMO 1 - #ifdef __ENV_LINUX__ +# define __SDL__ 1 # define SDL_AUDIO 1 # ifdef OGL @@ -47,17 +54,17 @@ # define GII_INPUT 1 # define GII_XWIN 1 # else -# ifdef SVGA -# define SVGALIB_VIDEO 1 -# define SVGALIB_INPUT 1 +# ifdef GGI +# define GGI_VIDEO 1 +# define GII_INPUT 1 # else -# ifdef GGI -# define GGI_VIDEO 1 -# define GII_INPUT 1 +# ifdef SVGA +# define SVGALIB_VIDEO 1 +# define SVGALIB_INPUT 1 # else # define SDL_VIDEO 1 # define SDL_INPUT 1 -# endif +# endif # endif # endif #endif diff --git a/configure.in b/configure.in index 6a7a6df2..5ba15534 100644 --- a/configure.in +++ b/configure.in @@ -191,16 +191,58 @@ AC_OUTPUT( Makefile 2d/Makefile 3d/Makefile -maths/Makefile -mem/Makefile +arch/Makefile +arch/dos/Makefile +arch/dos/allg_snd/Makefile +arch/dos/allg_snd/sound/Makefile +arch/dos/allg_snd/sound/drv/Makefile +arch/dos/bak/Makefile +arch/dos/comm/Makefile +arch/dos/comm/include/Makefile +arch/dos/include/Makefile +arch/dos/mm_snd/Makefile +arch/dos/mm_snd/include/Makefile +arch/ogl/Makefile +arch/ogl/include/Makefile +arch/linux/Makefile +arch/linux/include/Makefile +arch/linux/svgalib/Makefile +arch/linux/svgalib/include/Makefile +arch/sdl/Makefile +arch/win32/Makefile +arch/win32/d3dframe/Makefile +arch/win32/include/Makefile cfile/Makefile iff/Makefile -texmap/Makefile -misc/Makefile +iff/archive/Makefile +includes/Makefile input/Makefile -video/Makefile -sound/Makefile -arch/Makefile +input/ggi/Makefile +input/ggi/include/Makefile +input/linux/Makefile +input/linux/include/Makefile +input/sdl/Makefile +input/sdl/include/Makefile +input/svgalib/Makefile +input/svgalib/include/Makefile main/Makefile -) - +main/editor/Makefile +main/old/Makefile +maths/Makefile +mem/Makefile +misc/Makefile +sound/Makefile +texmap/Makefile +unused/Makefile +unused/bios/Makefile +unused/lib/Makefile +unused/novga/Makefile +unused/pa_null/Makefile +unused/ui/Makefile +unused/vga/Makefile +unused/vga/new/Makefile +unused/win95/Makefile +video/Makefile +tools/Makefile +tools/cvs2cl/Makefile +) \ No newline at end of file diff --git a/iff/Makefile.am b/iff/Makefile.am index ebed0a87..01f40f24 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = archive + noinst_LIBRARIES = libiff.a INCLUDES = -I $(top_srcdir)/includes diff --git a/iff/archive/Makefile.am b/iff/archive/Makefile.am new file mode 100644 index 00000000..f11f43c5 --- /dev/null +++ b/iff/archive/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +iff15bpp.c iff8bpp.c iffmike.c ifftest.c ifftestv.c diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 00000000..95c3d01d --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,10 @@ +EXTRA_DIST = \ +d.bat lst.bat m.bat \ +test.lnk \ +dtypes.inc psmacros.inc pstypes.inc \ +3d.h args.h byteswap.h cfile.h checker.h cmd.h console.h \ +d_delay.h d_io.h dtypes.h error.h findfile.h fix.h gr.h grdef.h \ +hash.h ibitblt.h iff.h ipx.h loadgl.h maths.h modex.h mono.h \ +ogl_init.h pa_enabl.h palette.h pcx.h pstypes.h rle.h strio.h \ +strutil.h texmap.h timer.h u_dpmi.h u_mem.h vecmat.h vesa.h \ +test.c diff --git a/input/Makefile.am b/input/Makefile.am index 147d34ce..db8eba81 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,10 +1,13 @@ +SUBDIRS = ggi sdl linux svgalib + noinst_LIBRARIES = libinput.a INCLUDES = -I $(top_srcdir)/includes -I $(top_srcdir)/main -libinput_a_SOURCES = sdl_event.c sdl_key.c sdl_mouse.c \ -ggi_event.c ggi_key.c ggi_mouse.c \ +libinput_a_SOURCES = \ dos_key.c dos_joyc.c dos_joydefs.c dos_mouse.c \ +ggi_event.c ggi_key.c ggi_mouse.c \ linux_joydefs.c linux_joystick.c \ +sdl_event.c sdl_key.c sdl_mouse.c \ svgalib_event.c svgalib_key.c svgalib_mouse.c svgalib_init.c SUFFIXES = .asm @@ -14,3 +17,7 @@ SUFFIXES = .asm if ENV_DJGPP libinput_a_LIBADD += dos_joy2.o endif + +EXTRA_DIST = \ +dos_joy2.asm \ +ggi_init.c diff --git a/input/ggi/Makefile.am b/input/ggi/Makefile.am index cce89685..6f470da3 100644 --- a/input/ggi/Makefile.am +++ b/input/ggi/Makefile.am @@ -1,5 +1,4 @@ -noinst_LIBRARIES = libinputggi.a -INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -Iinclude +SUBDIRS = include -libinputggi_a_SOURCES = \ -event.c key.c mouse.c +EXTRA_DIST = \ +event.c init.c key.c mouse.c diff --git a/input/ggi/include/Makefile.am b/input/ggi/include/Makefile.am new file mode 100644 index 00000000..1b9c30c0 --- /dev/null +++ b/input/ggi/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +event.h key.h mouse.h diff --git a/input/linux/Makefile.am b/input/linux/Makefile.am index 711a38d9..1df32d00 100644 --- a/input/linux/Makefile.am +++ b/input/linux/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libinputlinux.a -INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -Iinclude -I../sdl/include -libinputlinux_a_SOURCES = \ -joystick.c joydefs.c +SUBDIRS = include + +EXTRA_DIST = \ +joydefs.c joystick.c diff --git a/input/linux/include/Makefile.am b/input/linux/include/Makefile.am new file mode 100644 index 00000000..e8451aea --- /dev/null +++ b/input/linux/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +joy.h joystick.h diff --git a/input/sdl/Makefile.am b/input/sdl/Makefile.am index 4e64b952..cc9a1256 100644 --- a/input/sdl/Makefile.am +++ b/input/sdl/Makefile.am @@ -1,4 +1,4 @@ -noinst_LIBRARIES = libinputsdl.a -INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -Iinclude -libinputsdl_a_SOURCES = \ -event.c key.c mouse.c +SUBDIRS = include + +EXTRA_DIST = \ +event.c key.c mouse.c diff --git a/input/sdl/include/Makefile.am b/input/sdl/include/Makefile.am new file mode 100644 index 00000000..1b9c30c0 --- /dev/null +++ b/input/sdl/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +event.h key.h mouse.h diff --git a/input/svgalib/Makefile.am b/input/svgalib/Makefile.am new file mode 100644 index 00000000..7b92e00e --- /dev/null +++ b/input/svgalib/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = include diff --git a/input/svgalib/include/Makefile.am b/input/svgalib/include/Makefile.am new file mode 100644 index 00000000..1b9c30c0 --- /dev/null +++ b/input/svgalib/include/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +event.h key.h mouse.h diff --git a/main/Makefile.am b/main/Makefile.am index 0484fbfb..b3b67af0 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,3 +1,5 @@ +SUBDIRS = editor old + INCLUDES = -I $(top_srcdir)/includes -fwritable-strings bin_PROGRAMS = d2x @@ -39,3 +41,18 @@ if USE_GGI endif endif + +EXTRA_DIST = \ +descent.cfg inferno.ini \ +link.bat \ +ai.h aistruct.h automap.h bm.h bmread.h cdrom.h cntrlcen.h collide.h \ +compbit.h config.h controls.h credits.h desc_id.h desw.h digi.h effects.h \ +endlevel.h fireball.h fuelcen.h fvi.h fvi_a.h game.h gamefont.h gamemine.h \ +gamepal.h gamesave.h gameseg.h gameseq.h gamestat.h gauges.h hostage.h \ +inferno.h joydefs.h kconfig.h kmatrix.h laser.h lighting.h menu.h mission.h \ +modem.h morph.h movie.h multi.h multibot.h netmisc.h network.h newdemo.h \ +newmenu.h object.h paging.h physics.h piggy.h player.h playsave.h polyobj.h \ +powerup.h render.h robot.h scores.h screens.h segment.h segpoint.h slew.h \ +songs.h sounds.h state.h switch.h terrain.h texmerge.h text.h textures.h \ +titles.h vclip.h vers_id.h wall.h weapon.h \ +dumpmine.c diff --git a/main/editor/Makefile.am b/main/editor/Makefile.am new file mode 100644 index 00000000..4458e28d --- /dev/null +++ b/main/editor/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +editor.h kdefs.h texpage.h diff --git a/main/old/Makefile.am b/main/old/Makefile.am new file mode 100644 index 00000000..f1b7b89a --- /dev/null +++ b/main/old/Makefile.am @@ -0,0 +1,5 @@ +EXTRA_DIST = \ +3dfx_des.h arcade.h coindev.h files.h iglasses.h settings.h \ +3dfx.c cdmix32.c cdrom.c coindev.c descentw.c digiobj.c iglasses.c \ +joydefs.c joydefsw.c modem.c movie.c newmodel.c rbtest.c terrain.c \ +windigi.c winferno.c winmodem.c winvideo.c diff --git a/maths/Makefile.am b/maths/Makefile.am index f9386314..f1b41b40 100644 --- a/maths/Makefile.am +++ b/maths/Makefile.am @@ -10,3 +10,7 @@ SUFFIXES = .asm if USE_ASM libmaths_a_LIBADD += vecmata.o fix.o endif + +EXTRA_DIST = \ +fix.asm vecmata.asm \ +fixc.c rand.c tables.c vecmat.c diff --git a/misc/Makefile.am b/misc/Makefile.am index 6c1cc5e3..be19d06e 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -10,3 +10,6 @@ byteswap.c d_io.c hash.c strutil.c #checker.o: checker.c # gcc -c -g $< -o $@ $(INCLUDES) $(CFLAGS) -I/usr/lib/checker/i686-pc-linux-gnu/include -I.. -I. +EXTRA_DIST = \ +byteswap.h dos_disk.h fileutil.h parsarg.h \ +d_glob.c errtest.c fileutil.c parsarg.c parstest.c diff --git a/sound/Makefile.am b/sound/Makefile.am index 38e119d1..86ac0252 100644 --- a/sound/Makefile.am +++ b/sound/Makefile.am @@ -1,4 +1,6 @@ noinst_LIBRARIES = libsound.a INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -libsound_a_SOURCES = sdl_digi.c sdl_cdrom.c \ + +libsound_a_SOURCES = \ +sdl_digi.c sdl_cdrom.c \ dos_digi.c dos_cdrom.c diff --git a/texmap/Makefile.am b/texmap/Makefile.am index 2edfbbc6..919f3059 100644 --- a/texmap/Makefile.am +++ b/texmap/Makefile.am @@ -12,3 +12,9 @@ libtexmap_a_LIBADD += tmapppro.o tmap_ll.o tmap_flt.o tmap_lin.o tmapfade.o else libtexmap_a_LIBADD += scanline.o endif + +EXTRA_DIST = \ +tmap_flt.asm tmap_inc.asm tmap_lin.asm tmap_ll.asm tmap_per.asm tmapfade.asm \ +tmappent.S tmapppro.S \ +scanline.h texmapl.h \ +scanline.c diff --git a/unused/Makefile.am b/unused/Makefile.am new file mode 100644 index 00000000..d5d77a92 --- /dev/null +++ b/unused/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = bios lib novga pa_null ui vga win95 + +EXTRA_DIST = \ +readme.txt diff --git a/unused/bios/Makefile.am b/unused/bios/Makefile.am new file mode 100644 index 00000000..186c797c --- /dev/null +++ b/unused/bios/Makefile.am @@ -0,0 +1,10 @@ +EXTRA_DIST = \ +x rbaudio.new \ +d.bat dd.bat make0000.bat make0001.bat make0100.bat x.bat y.bat \ +testk.lnk testm.lnk \ +keys.inc \ +joy.asm key.asm mouse.asm oldkey.asm timer.asm \ +dpmi.h error.h findfile.h ipx.h joy.h key.h mouse.h \ +rbaudio.h swiftcfg.h timer.h \ +dpmi.c error.c findfile.c ipx.c joyc.c key.c mono.c mouse.c \ +rbaudio.c speaker.c testj.c testk.c testm.c testms.c testt.c timerp.c x.c diff --git a/unused/lib/Makefile.am b/unused/lib/Makefile.am new file mode 100644 index 00000000..7e25cd14 --- /dev/null +++ b/unused/lib/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +fix.h rbaudio.h diff --git a/unused/novga/Makefile.am b/unused/novga/Makefile.am new file mode 100644 index 00000000..428515c3 --- /dev/null +++ b/unused/novga/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +files.rc \ +novesa.c diff --git a/unused/pa_null/Makefile.am b/unused/pa_null/Makefile.am new file mode 100644 index 00000000..43ce75ef --- /dev/null +++ b/unused/pa_null/Makefile.am @@ -0,0 +1,3 @@ +EXTRA_DIST = \ +pa_enabl.h poly_acc.h \ +poly_acc.c diff --git a/unused/ui/Makefile.am b/unused/ui/Makefile.am new file mode 100644 index 00000000..82ab10a3 --- /dev/null +++ b/unused/ui/Makefile.am @@ -0,0 +1,6 @@ +EXTRA_DIST = \ +func.h ui.h \ +barbox.c button.c checkbox.c file.c func.c gadget.c harderr.c icon.c \ +inputbox.c keypad.c keypress.c keytrap.c listbox.c medfunc.c menu.c \ +menubar.c message.c mouse.c number.c popup.c radio.c scroll.c ui.c \ +uidraw.c userbox.c window.c diff --git a/unused/vga/Makefile.am b/unused/vga/Makefile.am new file mode 100644 index 00000000..7afd6caa --- /dev/null +++ b/unused/vga/Makefile.am @@ -0,0 +1,9 @@ +SUBDIRS = new + +EXTRA_DIST = \ +dd.bat xyz.bat \ +framebuf.jas vga.jas \ +tweak.inc vgaregs.inc \ +modex.asm vesa.asm \ +fxdpmi.h fxvesa.h grx.h vga.h \ +framebuf.c palette.c vga.c diff --git a/unused/vga/new/Makefile.am b/unused/vga/new/Makefile.am new file mode 100644 index 00000000..9f797584 --- /dev/null +++ b/unused/vga/new/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST = \ +palette.c vga.c diff --git a/unused/win95/Makefile.am b/unused/win95/Makefile.am new file mode 100644 index 00000000..4b8ccfd5 --- /dev/null +++ b/unused/win95/Makefile.am @@ -0,0 +1,8 @@ +EXTRA_DIST = \ +dd.bat \ +winckpit.asm \ +comm.h dd.h direct3d.h ds.h error.h global.h iforce.h midifile.h midiseq.h \ +tactile.h winapp.h winmidi.h winregs.h xtapi.h \ +comm.c dd.c ddgfx.c ddgr.c ddraw.c direct3d.c ds.c error.c findfile.c gfx.c \ +iforce.c ipx.c joyc.c key.c mono.c mouse.c palette.c rbaudio.c swift.c \ +tactile.c timer.c winapp.c winmidi.c winmono.c winregs.c xtapi.c diff --git a/video/Makefile.am b/video/Makefile.am index 3c1aecc5..48c433c7 100644 --- a/video/Makefile.am +++ b/video/Makefile.am @@ -1,4 +1,9 @@ noinst_LIBRARIES = libvideo.a INCLUDES = -I $(top_srcdir) -I$(top_srcdir)/includes -I$(top_srcdir)/main -libvideo_a_SOURCES = ogl.c ogl_glx.c ogl_gr.c \ + +libvideo_a_SOURCES = \ +ogl.c ogl_glx.c ogl_gr.c \ sdl_gr.c dos_gr.c svgalib_gr.c ggi_gr.c + +EXTRA_DIST = \ +ogl_wgl.c -- 2.39.2