More fixing build system

Originally committed to SVN as r1148.
This commit is contained in:
Niels Martin Hansen 2007-04-26 21:38:42 +00:00
parent e52740570a
commit d244277ac9
16 changed files with 25 additions and 87 deletions

View file

@ -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) \

View file

@ -1,7 +0,0 @@
EXTRA_aegisub_SOURCES = \
assert.hpp \
checked_delete.hpp \
shared_count.hpp \
shared_ptr.hpp \
throw_exception.hpp \
workaround.hpp

View file

@ -1 +0,0 @@
EXTRA_aegisub_SOURCES = glext.h

View file

@ -1,2 +0,0 @@
## TODO: this file probably needs to catch more of the files
EXTRA_aegisub_SOURCES = bevelButton.cpp res.cpp

View file

@ -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

View file

@ -1,4 +1,17 @@
#!/bin/sh
# Generate file list for automation subdir
rm -f automation/Makefile.am
cat > automation/Makefile.am <<EOF
## This file is automatically generated.
## Please edit autogen.sh if you need to modify this file.
EXTRA_DIST = \\
EOF
find automation/ -name '*.lua' -or -name '*.rb' -or -name '*.auto3' -or -name '*.txt' | sed '{s/^automation\//\t/; s/$/ \\/}' >> 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

View file

@ -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

View file

@ -1 +0,0 @@
EXTRA_DIST = line-per-syllable.lua multi-template.lua readme.txt simple-k-replacer.lua

View file

@ -1 +0,0 @@
EXTRA_DIST = kara-templater.lua

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,3 +1,5 @@
AUTOMAKE_OPTIONS = foreign
LANGS=de es fr it ko pt_BR ru
localedir = $(datadir)/locale