From 2af4434ad15510c12518963cef40c36a15fd02ef Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Sat, 20 Oct 2001 03:11:35 +0000 Subject: [PATCH] make dist more sensible --- Makefile.am | 14 ++++++-------- arch/Makefile.am | 8 +++----- arch/dos/Makefile.am | 10 ++-------- arch/linux/Makefile.am | 10 ++-------- arch/win32/Makefile.am | 8 +------- iff/Makefile.am | 6 +----- input/Makefile.am | 8 +------- main/Makefile.am | 8 +------- 8 files changed, 17 insertions(+), 55 deletions(-) diff --git a/Makefile.am b/Makefile.am index c2f6f1df..c84723a6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,20 +43,18 @@ d2x_svga_LDADD = ${d2x_sdl_LDADD} ${SVGA_LIBS} d2x_ggi_LDADD = ${d2x_sdl_LDADD} ${GGI_LIBS} dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS/ -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done + rm -rf `find $(distdir) -name CVS` +# rm -f `find $(distdir) -name Makefile` $(MAKE) changelog - cp -a ChangeLog $(distdir) + cp -a $(srcdir)/ChangeLog $(distdir) changelog:: rm -f $(srcdir)/ChangeLog touch $(srcdir)/ChangeLog - $(srcdir)/tools/cvs2cl/cvs2cl.pl -b --utc - rm -f ChangeLog.bak + cd $(srcdir) && tools/cvs2cl/cvs2cl.pl -b --utc + rm -f $(srcdir)/ChangeLog.bak -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ ChangeLog \ djgpp.bat djgpp.sh \ autogen.sh cygconf \ diff --git a/arch/Makefile.am b/arch/Makefile.am index cadd5ac5..5ef61cb2 100644 --- a/arch/Makefile.am +++ b/arch/Makefile.am @@ -1,9 +1,7 @@ SUBDIRS = @D2X_ARCH_SUBDIRS@ + DIST_SUBDIRS = dos linux sdl win32 + EXTRA_SUBDIRS = include -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done +EXTRA_DIST = ${EXTRA_SUBDIRS} diff --git a/arch/dos/Makefile.am b/arch/dos/Makefile.am index bda687e4..8f68a073 100644 --- a/arch/dos/Makefile.am +++ b/arch/dos/Makefile.am @@ -14,14 +14,8 @@ if ENV_DJGPP libarch_dos_a_LIBADD += timer.o modex.o endif -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ tweak.inc vgaregs.inc \ modex.asm timer.asm \ -digiallg.c digimm.c disk.c midiallg.c mono.c serial.c \ +bcd.c digiallg.c digimm.c disk.c midiallg.c mono.c serial.c \ ipx.h mono.h - -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done diff --git a/arch/linux/Makefile.am b/arch/linux/Makefile.am index ec10b042..41e7fa98 100644 --- a/arch/linux/Makefile.am +++ b/arch/linux/Makefile.am @@ -11,14 +11,8 @@ libarch_linux_a_SOURCES = findfile.c init.c endif EXTRA_libarch_linux_a_SOURCES = \ -ipx_bsd.c ipx_kali.c ipx_lin.c linuxnet.c ukali.c +ipx_bsd.c ipx_kali.c ipx_lin.c ipx_udp.c linuxnet.c ukali.c -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ alsadigi.c hmistub.c serial.c ukali.c \ hmiplay.c mono.c timer.c - -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done diff --git a/arch/win32/Makefile.am b/arch/win32/Makefile.am index b33270cb..2f28bfe1 100644 --- a/arch/win32/Makefile.am +++ b/arch/win32/Makefile.am @@ -10,13 +10,7 @@ else libarch_win32_a_SOURCES = findfile.c mingw_init.c endif -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ d1x.ico d1x.rc d3d.ico debug.cpp descent.ico digi.c findfile.c glinit.c gr.c \ hmpfile.c init.c ipx_win.c joydefs.c joyhh.c key.c mono.c mouse.c palw32.c \ pch.cpp scene.cpp serial.c texture.cpp timer.c win32.c winmain.cpp winnet.c - -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done diff --git a/iff/Makefile.am b/iff/Makefile.am index f3676b7b..9ea5d231 100644 --- a/iff/Makefile.am +++ b/iff/Makefile.am @@ -5,8 +5,4 @@ INCLUDES = -I $(top_srcdir)/includes libiff_a_SOURCES = iff.c -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done +EXTRA_DIST = ${EXTRA_SUBDIRS} diff --git a/input/Makefile.am b/input/Makefile.am index 83c83705..98220285 100644 --- a/input/Makefile.am +++ b/input/Makefile.am @@ -40,12 +40,6 @@ if ENV_DJGPP libinput_a_LIBADD = dos_joy2.o endif -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ dos_joy2.asm \ ggi_init.c - -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done diff --git a/main/Makefile.am b/main/Makefile.am index 7367d6ae..f78604e1 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -27,7 +27,7 @@ credits.c gamemine.c kmatrix.c newmenu.c songs.c \ crypt.c gamepal.c laser.c object.c state.c \ console.c cmd.c -EXTRA_DIST = \ +EXTRA_DIST = ${EXTRA_SUBDIRS} \ descent.cfg inferno.ini \ link.bat \ ai.h aistruct.h automap.h bm.h bmread.h cdrom.h cntrlcen.h collide.h \ @@ -41,9 +41,3 @@ 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 ipx_drv.c - -dist-hook: - list='$(EXTRA_SUBDIRS)'; for subdir in $$list; do \ - ( cd $(srcdir) && tar --exclude=CVS -cf - $$subdir ) \ - | ( cd $(distdir) && tar xf - ) \ - done -- 2.39.2