From d244277ac9deb47b635cde8134c3bf6b277d0567 Mon Sep 17 00:00:00 2001 From: Niels Martin Hansen Date: Thu, 26 Apr 2007 21:38:42 +0000 Subject: [PATCH] More fixing build system Originally committed to SVN as r1148. --- aegisub/Makefile.am | 13 ++++++++++--- aegisub/boost/Makefile.am | 7 ------- aegisub/gl/Makefile.am | 1 - aegisub/macosx/Makefile.am | 2 -- aegisub/win32/Makefile.am | 2 -- autogen.sh | 13 +++++++++++++ automation/Makefile.am | 4 ---- automation/auto3/Makefile.am | 1 - automation/autoload/Makefile.am | 1 - automation/demos/Makefile.am | 7 ------- automation/demos/auto3/Makefile.am | 13 ------------- automation/include/Makefile.am | 13 ------------- automation/tests/Makefile.am | 12 ------------ automation/v4-docs/Makefile.am | 11 ----------- configure.ac | 10 ---------- locale/Makefile.am | 2 ++ 16 files changed, 25 insertions(+), 87 deletions(-) delete mode 100644 aegisub/boost/Makefile.am delete mode 100644 aegisub/gl/Makefile.am delete mode 100644 aegisub/macosx/Makefile.am delete mode 100644 aegisub/win32/Makefile.am delete mode 100644 automation/Makefile.am delete mode 100644 automation/auto3/Makefile.am delete mode 100644 automation/autoload/Makefile.am delete mode 100644 automation/demos/Makefile.am delete mode 100644 automation/demos/auto3/Makefile.am delete mode 100644 automation/include/Makefile.am delete mode 100644 automation/tests/Makefile.am delete mode 100644 automation/v4-docs/Makefile.am diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 491b7e903..9e866c1db 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -1,9 +1,12 @@ +AUTOMAKE_OPTIONS = foreign + EXTRA_DIST = res.rc $(srcdir)/*.h beautify + SUFFIXES = .c .cpp .rc ## Most of these are just to catch extra sources for tarball. ## I'm not sure if the build subdir should be included here...? --jfs -SUBDIRS = bitmaps gl macosx posix win32 +SUBDIRS = bitmaps posix bin_PROGRAMS = aegisub @@ -12,7 +15,7 @@ bin_PROGRAMS = aegisub ## include, which is then included in source tarball? ## Similar to what the make-svn-rev-header.py scripts do currently. ## --jfs -SVNREV := $(strip $(shell grep -m 1 revision= .svn/entries 2>/dev/null | cut -d \" -f 2)) +SVNREV := $(shell svnversion | sed 's/[^0-9]//') DARCSREV := $(strip $(shell head -n 1 ../_darcs/inventory 2>/dev/null)) REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBUILD_DARCS) BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION) @@ -90,7 +93,11 @@ EXTRA_aegisub_SOURCES = \ video_display_fextracker.cpp \ video_provider_avs.cpp \ video_provider_dshow.cpp \ - video_provider_lavc.cpp + video_provider_lavc.cpp \ + boost/*.hpp \ + csri/*.h \ + gl/*.h \ + win32/stdint.h aegisub_SOURCES = \ $(AUDIO_PLAYER) \ diff --git a/aegisub/boost/Makefile.am b/aegisub/boost/Makefile.am deleted file mode 100644 index 79be04e37..000000000 --- a/aegisub/boost/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_aegisub_SOURCES = \ - assert.hpp \ - checked_delete.hpp \ - shared_count.hpp \ - shared_ptr.hpp \ - throw_exception.hpp \ - workaround.hpp diff --git a/aegisub/gl/Makefile.am b/aegisub/gl/Makefile.am deleted file mode 100644 index aa37d09a2..000000000 --- a/aegisub/gl/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_aegisub_SOURCES = glext.h diff --git a/aegisub/macosx/Makefile.am b/aegisub/macosx/Makefile.am deleted file mode 100644 index c6a017bf3..000000000 --- a/aegisub/macosx/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -## TODO: this file probably needs to catch more of the files -EXTRA_aegisub_SOURCES = bevelButton.cpp res.cpp diff --git a/aegisub/win32/Makefile.am b/aegisub/win32/Makefile.am deleted file mode 100644 index cd4a2583a..000000000 --- a/aegisub/win32/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -## Make sure stdint.h for MSVC is also included in source dists made by 'make dist' -EXTRA_aegisub_SOURCES = stdint.h diff --git a/autogen.sh b/autogen.sh index 030da8ab5..fc88c9617 100644 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,17 @@ #!/bin/sh +# Generate file list for automation subdir +rm -f automation/Makefile.am +cat > automation/Makefile.am <> automation/Makefile.am +echo "\tdemos/raytracer-test1.ass \\" >> automation/Makefile.am +echo "\tv4-docs/template-scripting-ideas.ass\n\n" >> automation/Makefile.am + autoreconf -f -i -s diff --git a/automation/Makefile.am b/automation/Makefile.am deleted file mode 100644 index a1762b887..000000000 --- a/automation/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## TODO: this should be installed as data files -EXTRA_DIST = automation3.txt -## So should all the stuff in the subdirs -SUBDIRS = auto3 autoload demos tests include v4-docs diff --git a/automation/auto3/Makefile.am b/automation/auto3/Makefile.am deleted file mode 100644 index 6b710ebb3..000000000 --- a/automation/auto3/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = line-per-syllable.lua multi-template.lua readme.txt simple-k-replacer.lua diff --git a/automation/autoload/Makefile.am b/automation/autoload/Makefile.am deleted file mode 100644 index 6578ae413..000000000 --- a/automation/autoload/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = kara-templater.lua diff --git a/automation/demos/Makefile.am b/automation/demos/Makefile.am deleted file mode 100644 index 75e1e2518..000000000 --- a/automation/demos/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - macro-1-edgeblur.lua macro-2-mkfullwitdh.lua \ - k-replacer.rb \ - raytracer.lua \ - future-windy-blur.lua - -SUBDIRS = auto3 diff --git a/automation/demos/auto3/Makefile.am b/automation/demos/auto3/Makefile.am deleted file mode 100644 index 3f86e0d30..000000000 --- a/automation/demos/auto3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = \ - 1-minimal.lua \ - 2-dump.lua \ - 3-include.lua \ - 4-text_extents.lua \ - 5-configuration.lua \ - 6-simple-effect.lua \ - 7-advanced-effect.lua \ - 8-skeleton.lua \ - 9-advanced-skeleton.lua \ - 10-furigana.ass \ - 10-furigana.lua \ - readme.txt diff --git a/automation/include/Makefile.am b/automation/include/Makefile.am deleted file mode 100644 index dede5f886..000000000 --- a/automation/include/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = \ - utils.lua \ - unicode.lua \ - karaskel.lua \ - karaskel-adv.lua \ - karaskel-base.lua \ - readme.txt \ - utils.auto3 \ - karaskel-adv.auto3 \ - karaskel-base.auto3 \ - karaskel.auto3 \ - karaoke.rb \ - utils.rb diff --git a/automation/tests/Makefile.am b/automation/tests/Makefile.am deleted file mode 100644 index d9c53b5d6..000000000 --- a/automation/tests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -EXTRA_DIST = \ - test1.lua \ - test2.lua \ - test3.lua \ - test4.lua \ - test5.lua \ - test6.lua \ - test7.lua \ - test8.lua \ - test9.lua \ - test10.lua \ - test-text_extents.lua diff --git a/automation/v4-docs/Makefile.am b/automation/v4-docs/Makefile.am deleted file mode 100644 index dcebb96e4..000000000 --- a/automation/v4-docs/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -## Perhaps this should be installed as documentation and not data files... -## Probably should. -EXTRA_DIST = \ - basic-function-interface.txt \ - configuration-dialogs.txt \ - file-streams.txt \ - misc.txt \ - overview.txt \ - progress-reporting.txt \ - subtitle-data.txt \ - template-scripting-ideas.ass diff --git a/configure.ac b/configure.ac index b4fb825a5..067539996 100644 --- a/configure.ac +++ b/configure.ac @@ -213,21 +213,11 @@ AC_OUTPUT([ Makefile ac/Makefile automation/Makefile - automation/auto3/Makefile - automation/autoload/Makefile - automation/demos/Makefile - automation/demos/auto3/Makefile - automation/tests/Makefile - automation/include/Makefile - automation/v4-docs/Makefile FexTrackerSource/Makefile locale/Makefile aegisub/Makefile aegisub/bitmaps/Makefile - aegisub/gl/Makefile - aegisub/macosx/Makefile aegisub/posix/Makefile - aegisub/win32/Makefile ]) if test -z "$found_audio"; then diff --git a/locale/Makefile.am b/locale/Makefile.am index 2bbc73cbb..d843c9577 100644 --- a/locale/Makefile.am +++ b/locale/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = foreign + LANGS=de es fr it ko pt_BR ru localedir = $(datadir)/locale