From 23e0d8f9f377030cfde3587b649b2cdce2d34845 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 13 Oct 2001 05:46:13 +0000 Subject: [PATCH] Removed automake stuff from "inert" subdirs. And there was much rejoicing. --- 2d/Makefile.am | 2 +- Makefile.am | 8 ++++-- arch/Makefile.am | 7 +++++- arch/dos/Makefile.am | 5 ---- 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/include/Makefile.am | 1 - arch/linux/Makefile.am | 4 --- arch/linux/include/Makefile.am | 3 --- arch/win32/Makefile.am | 8 ------ arch/win32/d3dframe/Makefile.am | 5 ---- arch/win32/include/Makefile.am | 3 --- autogen.sh | 1 + configure.in | 33 ------------------------- iff/Makefile.am | 7 +++++- iff/archive/Makefile.am | 2 -- include/Makefile.am | 10 -------- input/Makefile.am | 7 +++++- input/linux/Makefile.am | 1 - input/linux/include/Makefile.am | 2 -- main/Makefile.am | 7 +++++- main/editor/Makefile.am | 2 -- main/old/Makefile.am | 5 ---- tools/Makefile.am | 1 - tools/cvs2cl/Makefile.am | 2 -- 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 ------ 41 files changed, 32 insertions(+), 174 deletions(-) delete mode 100644 arch/dos/Makefile.am delete mode 100644 arch/dos/allg_snd/Makefile.am delete mode 100644 arch/dos/allg_snd/sound/Makefile.am delete mode 100644 arch/dos/allg_snd/sound/drv/Makefile.am delete mode 100644 arch/dos/bak/Makefile.am delete mode 100644 arch/dos/comm/Makefile.am delete mode 100644 arch/dos/comm/include/Makefile.am delete mode 100644 arch/dos/include/Makefile.am delete mode 100644 arch/dos/mm_snd/Makefile.am delete mode 100644 arch/dos/mm_snd/include/Makefile.am delete mode 100644 arch/include/Makefile.am delete mode 100644 arch/linux/Makefile.am delete mode 100644 arch/linux/include/Makefile.am delete mode 100644 arch/win32/Makefile.am delete mode 100644 arch/win32/d3dframe/Makefile.am delete mode 100644 arch/win32/include/Makefile.am delete mode 100644 iff/archive/Makefile.am delete mode 100644 include/Makefile.am delete mode 100644 input/linux/Makefile.am delete mode 100644 input/linux/include/Makefile.am delete mode 100644 main/editor/Makefile.am delete mode 100644 main/old/Makefile.am delete mode 100644 tools/Makefile.am delete mode 100644 tools/cvs2cl/Makefile.am delete mode 100644 unused/Makefile.am delete mode 100644 unused/bios/Makefile.am delete mode 100644 unused/lib/Makefile.am delete mode 100644 unused/novga/Makefile.am delete mode 100644 unused/pa_null/Makefile.am delete mode 100644 unused/ui/Makefile.am delete mode 100644 unused/vga/Makefile.am delete mode 100644 unused/vga/new/Makefile.am delete mode 100644 unused/win95/Makefile.am diff --git a/2d/Makefile.am b/2d/Makefile.am index ddbb31ec..7689639c 100644 --- a/2d/Makefile.am +++ b/2d/Makefile.am @@ -24,4 +24,4 @@ endif EXTRA_DIST = \ linear.asm scalea.asm tmerge_a.asm \ bitmap.h clip.h linear.h scalea.h \ -scale.c +scale.c tmerge.c diff --git a/Makefile.am b/Makefile.am index 040b7929..26171022 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,11 @@ -SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main \ -includes tools unused +SUBDIRS = 2d 3d maths mem cfile iff texmap misc input video sound arch main + +EXTRA_SUBDIRS = includes tools unused dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done $(MAKE) changelog cp -a ChangeLog $(distdir) diff --git a/arch/Makefile.am b/arch/Makefile.am index 9ee9d599..9e05f8b6 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include dos linux win32 +EXTRA_SUBDIRS = dos include linux win32 noinst_LIBRARIES = libarch.a INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include @@ -41,3 +41,8 @@ endif EXTRA_DIST = \ dos_tweak.inc dos_vgaregs.inc \ dos_modex.asm dos_timer.asm + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am deleted file mode 100644 index a2d4309d..00000000 --- a/arch/dos/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -SUBDIRS = allg_snd bak comm include mm_snd - -EXTRA_DIST = \ -ipx.h mono.h \ -bcd.c digiallg.c digimm.c disk.c midiallg.c mono.c serial.c diff --git a/arch/dos/allg_snd/Makefile.am b/arch/dos/allg_snd/Makefile.am deleted file mode 100644 index 915f313a..00000000 --- a/arch/dos/allg_snd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index b5bd20e2..00000000 --- a/arch/dos/allg_snd/sound/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index a84bde46..00000000 --- a/arch/dos/allg_snd/sound/drv/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 56a9f620..00000000 --- a/arch/dos/bak/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -ipx.c diff --git a/arch/dos/comm/Makefile.am b/arch/dos/comm/Makefile.am deleted file mode 100644 index 889e33a5..00000000 --- a/arch/dos/comm/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 3992b967..00000000 --- a/arch/dos/comm/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 7568225f..00000000 --- a/arch/dos/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -commlib.h disk.h dzcomm.h midiallg.h serial.h diff --git a/arch/dos/mm_snd/Makefile.am b/arch/dos/mm_snd/Makefile.am deleted file mode 100644 index c88a2ef0..00000000 --- a/arch/dos/mm_snd/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index c4695e25..00000000 --- a/arch/dos/mm_snd/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -mdma.h mikmod.h mirq.h mm_drv.h mmio.h mtypes.h diff --git a/arch/include/Makefile.am b/arch/include/Makefile.am deleted file mode 100644 index 90229409..00000000 --- a/arch/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = event.h key.h mouse.h joy.h diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am deleted file mode 100644 index 78ac4cf1..00000000 --- a/arch/linux/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = include - -EXTRA_DIST = \ -alsadigi.c hmiplay.c hmistub.c ipx_kali.c mono.c serial.c timer.c ukali.c diff --git a/arch/linux/include/Makefile.am b/arch/linux/include/Makefile.am deleted file mode 100644 index 4686107b..00000000 --- a/arch/linux/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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/win32/Makefile.am b/arch/win32/Makefile.am deleted file mode 100644 index a609f8ab..00000000 --- a/arch/win32/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 25ada097..00000000 --- a/arch/win32/d3dframe/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index bd8f6a03..00000000 --- a/arch/win32/include/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -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 07212a61..99035ad6 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,6 @@ #!/bin/sh set -e +touch ChangeLog aclocal $ACLOCAL_FLAGS autoheader automake --add-missing diff --git a/configure.in b/configure.in index 6d917c32..c55c2900 100644 --- a/configure.in +++ b/configure.in @@ -226,47 +226,14 @@ Makefile 2d/Makefile 3d/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/include/Makefile -arch/linux/Makefile -arch/linux/include/Makefile -arch/win32/Makefile -arch/win32/d3dframe/Makefile -arch/win32/include/Makefile cfile/Makefile iff/Makefile -iff/archive/Makefile -includes/Makefile input/Makefile -input/linux/Makefile -input/linux/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 01f40f24..84be250b 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -1,6 +1,11 @@ -SUBDIRS = archive +EXTRA_SUBDIRS = archive noinst_LIBRARIES = libiff.a INCLUDES = -I $(top_srcdir)/includes libiff_a_SOURCES = iff.c + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/iff/archive/Makefile.am b/iff/archive/Makefile.am deleted file mode 100644 index f11f43c5..00000000 --- a/iff/archive/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -iff15bpp.c iff8bpp.c iffmike.c ifftest.c ifftestv.c diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 95c3d01d..00000000 --- a/include/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 a958b36b..7e957211 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = linux +EXTRA_SUBDIRS = linux INCLUDES = -I$(top_srcdir)/includes -I$(top_srcdir)/main -I$(top_srcdir)/arch/include @@ -43,3 +43,8 @@ endif EXTRA_DIST = \ dos_joy2.asm \ ggi_init.c + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/input/linux/Makefile.am b/input/linux/Makefile.am deleted file mode 100644 index 7b92e00e..00000000 --- a/input/linux/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = include diff --git a/input/linux/include/Makefile.am b/input/linux/include/Makefile.am deleted file mode 100644 index 6c6d6ecc..00000000 --- a/input/linux/include/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -linux_joystick.h diff --git a/main/Makefile.am b/main/Makefile.am index 89b2c939..69d6cc4d 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = editor old +EXTRA_SUBDIRS = editor old CFLAGS += -fwritable-strings @@ -55,3 +55,8 @@ 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 + +dist-hook: + list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ + tar --exclude=CVS -cf - $$subdir | ( cd $(distdir) && tar xf - ) \ + done diff --git a/main/editor/Makefile.am b/main/editor/Makefile.am deleted file mode 100644 index 4458e28d..00000000 --- a/main/editor/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -editor.h kdefs.h texpage.h diff --git a/main/old/Makefile.am b/main/old/Makefile.am deleted file mode 100644 index f1b7b89a..00000000 --- a/main/old/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -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/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 4f266314..00000000 --- a/tools/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = cvs2cl diff --git a/tools/cvs2cl/Makefile.am b/tools/cvs2cl/Makefile.am deleted file mode 100644 index a7f30b05..00000000 --- a/tools/cvs2cl/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -cvs2cl.pl diff --git a/unused/Makefile.am b/unused/Makefile.am deleted file mode 100644 index d5d77a92..00000000 --- a/unused/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 186c797c..00000000 --- a/unused/bios/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -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 deleted file mode 100644 index 7e25cd14..00000000 --- a/unused/lib/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -fix.h rbaudio.h diff --git a/unused/novga/Makefile.am b/unused/novga/Makefile.am deleted file mode 100644 index 428515c3..00000000 --- a/unused/novga/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -files.rc \ -novesa.c diff --git a/unused/pa_null/Makefile.am b/unused/pa_null/Makefile.am deleted file mode 100644 index 43ce75ef..00000000 --- a/unused/pa_null/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = \ -pa_enabl.h poly_acc.h \ -poly_acc.c diff --git a/unused/ui/Makefile.am b/unused/ui/Makefile.am deleted file mode 100644 index 82ab10a3..00000000 --- a/unused/ui/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 7afd6caa..00000000 --- a/unused/vga/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 9f797584..00000000 --- a/unused/vga/new/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST = \ -palette.c vga.c diff --git a/unused/win95/Makefile.am b/unused/win95/Makefile.am deleted file mode 100644 index 91b2f243..00000000 --- a/unused/win95/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -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 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 -- 2.39.2