Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage.

Originally committed to SVN as r4895.
2010-12-05 19:12:42 +00:00 · 2010-12-05 19:12:42 +00:00 · 5a635ebdb3
commit 5a635ebdb3
parent d6e9ee9487
42 changed files with 4700 additions and 1528 deletions
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@ -1,19 +1,16 @@
-AUTOMAKE_OPTIONS = foreign
+include Makefile.inc
-
+ifeq (yes, $(WITH_LIBASS))
-if WITH_INTERNAL_LIBASS
+SUBDIRS += libass
 libass = libass
 endif
-if HAVE_PROVIDER_FFMPEGSOURCE
+ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE))
-ffmpegsource = libffms
+SUBDIRS += libffms
 endif
-SUBDIRS = \
+SUBDIRS += \
 	universalchardet \
 	libaegisub \
 	$(ffmpegsource) \
    $(libass) \
 	tools \
 	src \
 	reporter \
@ -21,32 +18,40 @@ SUBDIRS = \
 	desktop \
 	po
 all: ;
 ifeq (yes, $(BUILD_DARWIN))
 osx-bundle:
-	@SHELL@ tools/osx-bundle.sh "@BUNDLE_STRING@" @AEGISUB_VERSION_DATA@ DICT_DIR=$(DICT_DIR)
+	$(BIN_SHELL) tools/osx-bundle.sh "$(BUNDLE_STRING)" $(AEGISUB_VERSION_DATA) DICT_DIR=$(DICT_DIR)
 osx-dmg:
-	@SHELL@ tools/osx-dmg.sh "@BUNDLE_STRING@" "@DMG_STRING@"
+	$(BIN_SHELL) tools/osx-dmg.sh "$(BUNDLE_STRING)" "$(DMG_STRING)"
 osx-tinderbox-bundle:
-	@SHELL@ tools/osx-bundle.sh "$(T_BUNDLE)" @AEGISUB_VERSION_DATA@ DICT_DIR="$(DICT_DIR)"
+	$(BIN_SHELL) tools/osx-bundle.sh "$(T_BUNDLE)" $(AEGISUB_VERSION_DATA) DICT_DIR="$(DICT_DIR)"
 osx-tinderbox-dmg:
-	@SHELL@ tools/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)"
+	$(BIN_SHELL) tools/osx-dmg.sh "$(T_DMG)" "$(T_BUNDLE)"
-	mv  "$(T_DMG).dmg" bundle.dmg
+	$(BIN_MV)  "$(T_DMG).dmg" bundle.dmg
 endif
 EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in   \
 	intltool-update.in  \
 	config.guess \
 	config.sub \
 	depcomp \
 	install-sh \
 	LICENCE \
 	missing \
 	INSTALL \
 	LICENCE \
 	README \
-	svn_revision
+	acinclude.m4 \
 	autogen.sh \
 	configure.in \
 	acconf.h.in\
 	configure \
 	svn_revision \
 	config.log \
 	install-sh \
 	Makefile.inc \
 	Makefile.inc.in \
 	Makefile.target
 # m4macros/
 EXTRA_DIST += \
@ -73,7 +78,16 @@ EXTRA_DIST += \
 	packages/osx_dmg/dmg_set_style.applescript
-CLEANFILES= \
+DISTCLEANFILES += \
-	intltool-extract \
+	acconf.h \
-	intltool-merge \
+	configure \
-	intltool-update
+	acconf.h.in~ \
 	svn_revision \
 	Makefile.inc \
 	config.log \
 	acconf.h.in \
 	config.status \
 	autom4te.cache \
 	aclocal.m4 \
 include Makefile.target
--- a/aegisub/Makefile.inc.in
+++ b/aegisub/Makefile.inc.in
@ -0,0 +1,174 @@
 #########################
 # AEGISUB FEATURE SUPPORT
 #########################
 HAVE_ALSA					= @with_alsa@
 HAVE_AUTO4_LUA				= @with_auto4_lua@
 HAVE_AUTOMATION				= @with_automation@
 HAVE_FFMPEG					= @agi_cv_with_ffmpeg@
 HAVE_HUNSPELL				= @with_hunspell@
 HAVE_OPENAL					= @with_openal@
 HAVE_OPENMP					= @with_openmp@
 HAVE_OSS					= @with_oss@
 HAVE_PORTAUDIO				= @with_portaudio@
 HAVE_PROVIDER_FFMPEGSOURCE	= @with_provider_ffmpegsource@
 HAVE_PULSEAUDIO				= @with_pulseaudio@
 WITH_EXTERNAL_LIBASS		= @with_external_libass@
 WITH_LIBASS					= @with_libass@
 FOUND_AUDIO_PLAYER			= @found_audio_player@
 FOUND_VIDEO_PROVIDER		= @found_video_provider@
 ###################
 # PLATFORM SETTINGS
 ###################
 BUILD_BSD					= @build_bsd@
 BUILD_DARWIN				= @build_darwin@
 BUILD_DEFAULT				= @build_default@
 BUILD_LINUX					= @build_linux@
 #######
 # FLAGS
 #######
 CFLAGS				= @CFLAGS@
 CXXFLAGS			= @CXXFLAGS@
 CPPFLAGS			= @CPPFLAGS@
 CFLAGS_DEP			= -MD -MP
 LDFLAGS				= @LDFLAGS@
 INSTALL_FLAGS		= -m 664
 CCACHE_ENV			= CCACHE_SLOPPINESS=time_macros
 LIB_SHARED_LINK		= -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL)
 LIB_SHARED_LINK_OSX	= -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.5 -install_name ${CURDIR}/$(LIB_SHARED_FULL)
 #########
 # STRINGS
 #########
 AEGISUB_COMMAND			=@AEGISUB_COMMAND@
 AEGISUB_VERSION_DATA	=@AEGISUB_VERSION_DATA@
 BUILD_DATE				=@BUILD_DATE@
 PACKAGE_DEBUG			=@PACKAGE_DEBUG@
 SVN_REVISION			=@SVN_REVISION@
 DEBUG_FLAGS				=@DEBUG_FLAGS@
 # OS X
 BUNDLE_STRING			=@BUNDLE_STRING@
 DARWIN_ARCH				=@DARWIN_ARCH@
 DMG_STRING				=@DMG_STRING@
 GETTEXT_PACKAGE			=@GETTEXT_PACKAGE@
 #######
 # PATHS
 #######
 P_PREFIX				=@prefix@
 prefix					= ${P_PREFIX}
 P_PREFIX_EXEC			=@exec_prefix@
 exec_prefix				= ${P_PREFIX_EXEC}
 P_BINDIR				=@bindir@
 P_SBINDIR				=@sbindir@
 P_LIBEXEC				=@libexecdir@
 P_DATAROOT				=@datarootdir@
 P_SYSCONF				=@sysconfdir@
 P_SHAREDSTATE			=@sharedstatedir@
 P_LOCALSTATE			=@localstatedir@
 P_INCLUDE				=@includedir@
 P_LIB					=@libdir@
 P_LOCALE				=$(P_DATAROOT)/locale
 P_DESKTOP				=@P_DESKTOP@
 P_ICON					=@P_ICON@
 P_DATA					=$(P_DATAROOT)/aegisub/$(AEGISUB_VERSION_DATA)
 P_DOC					=$(P_DATAROOT)/doc/aegisub/$(AEGISUB_VERSION_DATA)
 ###############
 # LIBRARY FLAGS
 ###############
 CXXFLAGS_WX				= @WX_CXXFLAGS@
 CXXFLAGS_OPENMP			= @OPENMP_CXXFLAGS@
 CPPFLAGS_WX				= @WX_CPPFLAGS@
 CFLAGS_FONTCONFIG		= @FONTCONFIG_CFLAGS@
 CFLAGS_FREETYPE			= @FREETYPE_CFLAGS@
 CFLAGS_GL				= @GL_CFLAGS@
 CFLAGS_FFMPEGSOURCE		= -I../libffms/include
 CFLAGS_HUNSPELL			= @HUNSPELL_CFLAGS@
 CFLAGS_ICONV			= @ICONV_CFLAGS@
 CFLAGS_LIBASS			= -I../libass
 #CFLAGS_LIBASS			= @LIBASS_CFLAGS@
 CFLAGS_LIBAVCODEC		= @LIBAVCODEC_CFLAGS@
 CFLAGS_LIBAVFORMAT		= @LIBAVFORMAT_CFLAGS@
 CFLAGS_LIBAVUTIL		= @LIBAVUTIL_CFLAGS@
 CFLAGS_LIBCURL			= @LIBCURL_CFLAGS@
 CFLAGS_LIBPOSTPROC		= @LIBPOSTPROC_CFLAGS@
 CFLAGS_LIBPULSE			= @LIBPULSE_CFLAGS@
 CFLAGS_LIBSWSCALE		= @LIBSWSCALE_CFLAGS@
 CFLAGS_LUA				= @LUA_CFLAGS@
 CFLAGS_OPENAL			= @OPENAL_CFLAGS@
 CFLAGS_PORTAUDIO		= @PORTAUDIO_CFLAGS@
 CFLAGS_PTHREAD			= @PTHREAD_CFLAGS@
 CFLAGS_UCHARDET			= -I../universalchardet
 CFLAGS_WX				= @WX_CFLAGS@
 LDFLAGS_ALSA			= @ALSA_LDFLAGS@
 LDFLAGS_FONTCONFIG		= @FONTCONFIG_LIBS@
 LDFLAGS_FREETYPE		= @FREETYPE_LIBS@
 LDFLAGS_GL				= @GL_LIBS@
 LDFLAGS_FFMPEGSOURCE	= ../libffms/libffmpegsource_aegisub.a
 LDFLAGS_HUNSPELL		= @HUNSPELL_LIBS@
 LDFLAGS_ICONV			= @ICONV_LDFLAGS@
 LDFLAGS_LIBASS			= ../libass/libass_aegisub.a
 #LDFLAGS_LIBASS			= @LIBASS_LIBS@
 LDFLAGS_LIBAVCODEC		= @LIBAVCODEC_LIBS@
 LDFLAGS_LIBAVFORMAT		= @LIBAVFORMAT_LIBS@
 LDFLAGS_LIBAVUTIL		= @LIBAVUTIL_LIBS@
 LDFLAGS_LIBCURL			= @LIBCURL_LIBS@
 LDFLAGS_LIBPOSTPROC		= @LIBPOSTPROC_LIBS@
 LDFLAGS_LIBPULSE		= @LIBPULSE_LIBS@
 LDFLAGS_LIBSWSCALE		= @LIBSWSCALE_LIBS@
 LDFLAGS_LUA				= @LUA_LDFLAGS@
 LDFLAGS_OPENAL			= @OPENAL_LIBS@
 LDFLAGS_PTHREAD			= @PTHREAD_LIBS@
 LDFLAGS_PORTAUDIO		= @PORTAUDIO_LIBS@
 LDFLAGS_UCHARDET		?= ../universalchardet/libuniversalchardet.a
 LDFLAGS_WX				= @WX_LIBS@
 #####################
 # DEBUG / DEVELOPMENT
 #####################
 PRECOMPILED_HEADER		= @enable_gcc_prec@
 CCACHE_ENABLE			= @enable_ccache@
 LDFLAGS_CCMALLOC		= @CCMALLOC_LDFLAGS@
 LDFLAGS_DEBUG			= @DEBUG_FLAGS@
 LDFLAGS_EFENCE			= @EFENCE_LDFLAGS@
 LDFLAGS_GCOV			= @GCOV_LDFLAGS@
 CFLAGS_DEBUG			= @DEBUG_FLAGS@
 CFLAGS_EFENCE			= @EFENCE_LDFLAGS@
 CFLAGS_GCOV				= @GCOV_CFLAGS@
 ##########
 # BINARIES
 ##########
 BIN_AR			= ar
 BIN_RANLIB		= ranlib
 BIN_LN			= ln
 BIN_RM			= rm
 BIN_SHELL		= @SHELL@
 BIN_MV			= mv
 BIN_SED			= sed
 BIN_INSTALL 	= @INSTALL@
 BIN_MSGMERGE	= @MSGMERGE@
 BIN_XGETTEXT	= @XGETTEXT@
 BIN_MSGFMT		= @MSGFMT@
 BIN_CC			= @CC@
 BIN_CXX			= @CXX@
 BIN_CP			= cp
 BIN_MKDIR		= mkdir
 BIN_MKDIR_P		= mkdir -p
 BIN_ECHO		= echo
 BIN_TOUCH		= touch
--- a/aegisub/Makefile.target
+++ b/aegisub/Makefile.target
@ -0,0 +1,175 @@
 #  *** THERE ARE NO USER-EDITABLE ITEMS HERE. ***
 .PHONY: all install clean subdirs $(SUBDIRS)
 all: subdirs $(LIB) $(LIB_SHARED) $(PROGRAM)
 OBJ		= $(addsuffix .o, $(basename $(SRC)))
 DEP		= $(addsuffix .d, $(basename $(SRC)))
 ###################
 # PLATFORM SPECIFIC
 ###################
 ifeq (yes, $(BUILD_DARWIN))
 LIB_SHARED_LINK = $(LIB_SHARED_LINK_OSX)
 endif
 ###########
 # LIBRARIES
 ###########
 $(LIB) : $(OBJ)
 	$(BIN_AR) cru $@ $(OBJ)
 	$(BIN_RANLIB) $@
 ifdef LIB_SHARED
 LIB_SHARED_FULL = $(LIB_SHARED).$(LIB_VERSION)
 $(LIB_SHARED) : $(OBJ)
 	$(BIN_CXX) $(LIB_SHARED_LINK) $(OBJ) -o $(LIB_SHARED_FULL)
 	$(BIN_LN) -s $(LIB_SHARED_FULL) $(LIB_SHARED)
 CLEANFILES+= $(LIB_SHARED_FULL)
 endif
 ##########
 # PROGRAMS
 ##########
 $(PROGRAM): $(OBJ)
 	$(BIN_CXX) -o $@ $(LDFLAGS) $(OBJ) $(LDFLAGS_POST)
 ##########
 # CLEANING
 ##########
 clean: $(SUBDIRS)
 	$(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB) $(LIB_SHARED) $(PROGRAM)
 distclean: clean
 	$(BIN_RM) -rf $(DISTCLEANFILES) $(DEP)
 ifdef PRECOMPILED_HEADER_NAME
 	$(BIN_RM) -f $(PRECOMPILED_HEADER_NAME).gch
 endif
 #########
 # INSTALL
 #########
 ifeq (install, $(MAKECMDGOALS))
 INSTALL_LIB 		= $(addprefix $(P_LIB)/, $(LIB_SHARED) $(LIB_SHARED_FULL))
 endif
 install: $(SUBDIRS) install-share install-program install-lib
 install-program:
 ifdef PROGRAM_INSTALL
 	@$(BIN_MKDIR) -p $(P_BINDIR)
 	@$(BIN_INSTALL) $(PROGRAM) $(P_BINDIR)/$(PROGRAM)
 endif
 install-lib:
 ifdef LIB_SHARED_INSTALL
 	$(BIN_MKDIR) -p $(P_LIB)
 	$(BIN_INSTALL) $(LIB_SHARED_FULL) $(P_LIB)/$(LIB_SHARED_FULL)
 	$(BIN_LN) -sf $(P_LIB)/$(LIB_SHARED_FULL) $(P_LIB)/$(LIB_SHARED)
 endif
 install-share:
 ifdef DATA_SHARE
 	@$(BIN_MKDIR) -p $(addprefix $(P_DATA)/, $(dir $(DATA_SHARE)))
 	@for i in $(DATA_SHARE); do \
 		$(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DATA)/$$i"; \
 		$(BIN_INSTALL) $$i $(P_DATA)/$$i; \
 	done
 endif
 ifdef DATA_SHARE_DOC
 	@$(BIN_MKDIR) -p $(addprefix $(P_DOC)/, $(dir $(DATA_SHARE_DOC)))
 	@for i in $(DATA_SHARE_DOC); do \
 		$(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DOC)/$$i"; \
 		$(BIN_INSTALL) $$i $(P_DOC)/$$i; \
 	done
 endif
 ##############
 # DISTRIBUTION
 ##############
 distdir:
 	@if ! test -f packages/distfile/distfile.sh; then \
 		echo "Please run this from the parent directory."; \
 		exit 1; \
 	fi
 	${SHELL} packages/distfile/distfile.sh
 distfiles: $(SUBDIRS)
 	@for i in $(SRC) $(HEADER) $(EXTRA_DIST); do \
 		echo $(CURDIR)/$$i; \
 	done
 ########################
 # SUBDIRECTORY TRAVERSAL
 ########################
 subdirs: $(SUBDIRS)
 $(SUBDIRS):
 	$(MAKE) -C $@ $(MAKECMDGOALS)
 # Set relations to ensure dependencies are built before their targets during parallel builds.
 src: universalchardet libass libffms tools libaegisub
 tests: libaegisub
 reporter: src
 ####################
 # PRECOMPILED HEADER
 ####################
 ifeq (yes, $(PRECOMPILED_HEADER))
  ifdef PRECOMPILED_HEADER_NAME
    CXXFLAGS += -include $(PRECOMPILED_HEADER_NAME) -Winvalid-pch -fpch-deps -fpch-preprocess
    # This hack is required until we can use the 'private' keyword (gmake 3.82) to avoid all the
    # per-object CXXFLAGS being triggered by the ($OBJ) line.
    CXXFLAGS_GNU_MAKE_SUCKS := $(CXXFLAGS)
    $(OBJ): | $(PRECOMPILED_HEADER_NAME).gch
    $(PRECOMPILED_HEADER_NAME).gch: CXXFLAGS = $(CXXFLAGS_GNU_MAKE_SUCKS)
  endif
 endif
 ########
 # CCACHE
 ########
 ifeq (yes, $(CCACHE_ENABLE))
 CXX_ENV		= $(CCACHE_ENV)
 BIN_CC		:= ccache $(BIN_CC)
 BIN_CXX		:= ccache $(BIN_CXX)
 endif
 ##################
 # TRANSFORM RULES
 ##################
 .SUFFIXES:
 .SUFFIXES: .o .c .cpp .cxx
 %.o: %.c
 	$(CXX_ENV) $(BIN_CC) $(CFLAGS_DEP) $(CFLAGS) $(CXXFLAGS) -c -o $@ $<
 %.o: %.cpp
 	$(CXX_ENV) $(BIN_CXX) $(CFLAGS_DEP) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 %.o: %.cxx
 	$(CXX_ENV) $(BIN_CXX) $(CFLAGS_DEP) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
 $(PRECOMPILED_HEADER_NAME).gch: $(PRECOMPILED_HEADER_NAME)
 	$(CXX_ENV) $(BIN_CXX) $(CXXFLAGS) $(DEBUG_FLAGS) $<
 -include ($DEP)
 .SUFFIXES:
--- a/aegisub/autogen.sh
+++ b/aegisub/autogen.sh
@ -10,21 +10,16 @@
 # directly.
 ACLOCAL=${ACLOCAL-aclocal-1.10}
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 AUTOHEADER=${AUTOHEADER-autoheader}
 AUTOMAKE=${AUTOMAKE-automake-1.10}
 AUTOCONF=${AUTOCONF-autoconf}
 GETTEXTIZE=${GETTEXTIZE-glib-gettextize}
 INTLTOOLIZE=${INTLTOOLIZE-intltoolize}
 GLIB_REQUIRED_VERSION=2.10.0
 AUTOCONF_REQUIRED_VERSION=2.54
 AUTOMAKE_REQUIRED_VERSION=1.10
 INTLTOOL_REQUIRED_VERSION=0.31
 LIBTOOL_REQUIRED_VERSION=1.5
-REQUIRED_M4="fontutil.m4 glib-gettext.m4 intltool.m4 intl.m4 pkg.m4 iconv.m4"
+REQUIRED_M4="fontutil.m4 gettext.m4 pkg.m4 iconv.m4"
 REQUIRED_M4_WX="wxwin29.m4 wxwin.m4"
 PROJECT="aegisub"
@ -92,26 +87,6 @@ check_version ()
 DIE=0
 $ECHO_N "checking for libtool >= $LIBTOOL_REQUIRED_VERSION ... "
 if ($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
   LIBTOOLIZE=$LIBTOOLIZE
 elif (glibtoolize --version) < /dev/null > /dev/null 2>&1; then
   LIBTOOLIZE=glibtoolize
 else
    echo
    echo "  You must have libtool installed to compile $PROJECT."
    echo "  Install the appropriate package for your distribution,"
    echo "  or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
    echo
    DIE=1
 fi
 if test x$LIBTOOLIZE != x; then
    VER=`$LIBTOOLIZE --version \
         | grep libtool | sed "s/.* \([0-9.]*\)[-a-z0-9]*$/\1/"`
    check_version $VER $LIBTOOL_REQUIRED_VERSION
 fi
 $ECHO_N "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
 if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
    VER=`$AUTOCONF --version | head -n 1 \
@ -157,35 +132,6 @@ if test x$AUTOMAKE != x; then
 fi
 $ECHO_N "checking for $GETTEXTIZE ... "
 if ($GETTEXTIZE --version) < /dev/null > /dev/null 2>&1; then
    VER=`$GETTEXTIZE --version \
         | grep glib-gettextize | sed "s/.* \([0-9.]*\)/\1/"`
    check_version $VER $GLIB_REQUIRED_VERSION
 else
    echo
    echo "  You must have glib-gettextize installed to compile $PROJECT."
    echo "  glib-gettextize is part of glib-2.0, so you should already"
    echo "  have it. Make sure it is in your PATH."
    echo
    DIE=1
 fi
 $ECHO_N "checking for $INTLTOOLIZE >= $INTLTOOL_REQUIRED_VERSION ... "
 if ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1; then
    VER=`$INTLTOOLIZE --version \
         | grep intltoolize | sed "s/.* \([0-9.]*\)/\1/"`
    check_version $VER $INTLTOOL_REQUIRED_VERSION
 else
    echo
    echo "  You must have intltool installed to compile $PROJECT."
    echo "  Get the latest version from"
    echo "  ftp://ftp.gnome.org/pub/GNOME/sources/intltool/"
    echo
    DIE=1
 fi
 if test -z "$BIN_AWK"; then
  BIN_AWK=`which awk`
 fi
@ -274,24 +220,12 @@ if test $RC -ne 0; then
   exit $RC
 fi
 echo "--- $LIBTOOLIZE ---"
 $LIBTOOLIZE --force || exit $?
 echo "--- $AUTOHEADER ---"
 $AUTOHEADER || exit $?
 echo "--- $AUTOMAKE ---"
 $AUTOMAKE --add-missing || exit $?
 echo "--- $AUTOCONF ---"
 $AUTOCONF || exit $?
 echo "--- $GETTEXTIZE ---"
 $GETTEXTIZE --force || exit $?
 echo "--- $INTLTOOLIZE ---"
 $INTLTOOLIZE --force --automake || exit $?
 cd $ORIGDIR
 if ! test "$1" = "--skip-configure"; then
--- a/aegisub/automation/Makefile.am
+++ b/aegisub/automation/Makefile.am
@ -1,8 +1,7 @@
-automationdir = $(aegisubdatadir)/automation
+include ../Makefile.inc
 share_docdir = $(aegisubdocdir)
 # share/
-data_auto4_lua = \
+DATA_AUTOMATION += \
 	autoload/cleantags-autoload.lua \
 	autoload/kara-templater.lua \
 	autoload/karaoke-auto-leadin.lua \
@ -17,8 +16,7 @@ data_auto4_lua = \
 # share/doc
-
+DATA_GENERAL_DOC = \
 data_general_doc = \
 	demos/raytracer-test1.ass \
 	v4-docs/basic-function-interface.txt \
 	v4-docs/configuration-dialogs.txt \
@ -29,27 +27,25 @@ data_general_doc = \
 	v4-docs/subtitle-data.txt \
 	v4-docs/template-scripting-ideas.ass
-data_auto4_lua_doc = \
+DATA_AUTOMATION_DOC += \
 	demos/future-windy-blur.lua \
 	demos/raytracer.lua
 all: ;
 nobase_share_doc_DATA =
 nobase_automation_DATA =
-if HAVE_AUTOMATION
+install: install-share
-nobase_automation_DATA += $(data_general)
+	@$(BIN_MKDIR) -p $(addprefix $(P_DATA)/automation/, $(dir $(DATA_AUTOMATION)))
-nobase_share_doc_DATA += $(data_general_doc)
+	@for i in $(DATA_AUTOMATION); do \
-endif
+		$(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_DATA)/automation/$$i"; \
-
+		$(BIN_INSTALL) $$i $(P_DATA)/automation/$$i; \
-if HAVE_AUTO4_LUA
+	done
 nobase_automation_DATA += $(data_auto4_lua)
 nobase_share_doc_DATA += $(data_auto4_lua_doc)
 endif
 DATA_SHARE_DOC	= $(DATA_GENERAL_DOC) $(DATA_AUTOMATION_DOC)
 EXTRA_DIST = \
-	$(data_general) \
+	$(DATA_AUTOMATION) \
-	$(data_auto4_lua) \
+	$(DATA_GENERAL_DOC) \
-	$(data_general_doc) \
+	$(DATA_AUTOMATION_DOC)
-	$(data_auto4_lua_doc)
+
 include ../Makefile.target
--- a/aegisub/config.guess
+++ b/aegisub/config.guess
--- a/aegisub/config.sub
+++ b/aegisub/config.sub
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@ -38,7 +38,6 @@ m4_define([libass_required_version], [0.9.7])
 #######
 AC_INIT([Aegisub], [aegisub_version],, [aegisub])
 AC_CONFIG_SRCDIR([src/main.cpp])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([acconf.h])
 AC_GNU_SOURCE
 AC_CANONICAL_HOST
@ -57,6 +56,11 @@ case x"$target" in
 esac
 AC_MSG_RESULT([$target_or_host])
 build_darwin="no"
 build_linux="no"
 build_bsd="no"
 build_default="no"
 case "$target_or_host" in
  *-*-darwin*)
    build_darwin="yes"
@ -107,16 +111,11 @@ fi
 # Used for universalchardet.
 AC_AGI_MDCPUCFG($target_or_host)
 AM_CONDITIONAL([BUILD_BSD], [test "$build_bsd" = "yes"])
 AM_CONDITIONAL([BUILD_LINUX], [test "$build_linux" = "yes"])
-# For conditional file building and options in Makefile(s).
+AC_SUBST(build_bsd)
-AM_CONDITIONAL([BUILD_DARWIN], [test "$build_darwin" = "yes"])
+AC_SUBST(build_linux)
-AM_CONDITIONAL([BUILD_DEFAULT], [test "$build_default" = "yes"])
+AC_SUBST(build_darwin)
-
+AC_SUBST(build_default)
 # FontConfig is used on Darwin for the fontlister, freetype for !Windows case.
 AM_CONDITIONAL([FONTLISTER_FONTCONFIG], [test "$build_darwin" != "yes"])
 AM_CONDITIONAL([FONTLISTER_FREETYPE], [test "$build_darwin" = "yes"])
 # Handle endianess.
 AC_C_BIGENDIAN(
@ -142,25 +141,31 @@ AEGISUB_VERSION_DATA=aegisub_version_data
 AC_DEFINE_UNQUOTED(AEGISUB_VERSION_DATA, ["$AEGISUB_VERSION_DATA"], [Data path suffix.])
 AC_SUBST(AEGISUB_VERSION_DATA)
 # Shared data and Documents location.
 aegisubdatadir="$datadir/$PACKAGE/aegisub_version_data"
 AC_SUBST(aegisubdatadir)
 aegisubdocdir="$datadir/doc/$PACKAGE/aegisub_version_data"
 AC_SUBST(aegisubdocdir)
 # Name of aegisub binary.
 AEGISUB_COMMAND="aegisub-$AEGISUB_VERSION_MAJOR.$AEGISUB_VERSION_MINOR"
 AC_SUBST(AEGISUB_COMMAND)
 # Handle location of desktop files: http://freedesktop.org/wiki/Specifications/desktop-entry-spec
-AC_ARG_WITH(desktop-dir, [  --with-desktop-dir=PATH desktop file locations (default: PREFIX/share)])
+AC_ARG_WITH(desktop-dir, [  --with-desktop-dir=PATH desktop file locations
                          (default: PREFIX/share/applications)])
 if ! test -z "$with_desktop_dir" ; then
-  DESKTOP_DATADIR=$with_desktop_dir
+  P_DESKTOP=$with_desktop_dir
 else
-  DESKTOP_DATADIR="$datadir"
+  P_DESKTOP="$datarootdir/applications"
 fi
-AM_CONDITIONAL(DESKTOP_DATADIR, test "$with_desktop_dir" != "no")
+AC_SUBST(P_DESKTOP)
-AC_SUBST(DESKTOP_DATADIR)
+
 # Handle location of icons: http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html
 AC_ARG_WITH(icon-dir, [  --with-icon-dir=PATH icon locations (default: PREFIX/share/icons)])
 if ! test -z "$with_icon_dir" ; then
  P_ICON=$with_icon_dir
 else
  P_ICON="$datarootdir/icons"
 fi
 AC_SUBST(P_ICON)
 # Install prefix
@ -197,8 +202,8 @@ AC_PROG_CC
 AC_PROG_CXX
 AC_LANG(C++)
 AM_PROG_CC_C_O
 # This is reported to be required on Ubuntu, I haven't had time to check.
 define([AC_LIBTOOL_LANG_F77_CONFIG], [:])
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 PKG_PROG_PKG_CONFIG([pkgconfig_required_version])
@ -238,8 +243,8 @@ else
  PACKAGE_VERSION="${PACKAGE_VERSION}-dev-r${SVN_REVISION}"
  VERSION="${VERSION}-dev-r${SVN_REVISION}"
-  BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}"
+  BUNDLE_STRING="Aegisub-${PACKAGE_VERSION}"
-  DMG_STRING="Aegisub-${PACKAGE_VERSION}-dev-${SVN_REVISION}-${arch_bundle}"
+  DMG_STRING="Aegisub-${PACKAGE_VERSION}-${arch_bundle}"
 fi
@ -327,18 +332,19 @@ AC_CHECK_FUNC([strlcpy], [
   AC_DEFINE([HAVE_STRLCPY], [1], [strlcpy() exists in the c library.])
 ], [])
-AC_LIBTOOL_DLOPEN_SELF
+#AC_LIBTOOL_DLOPEN_SELF
 AC_MSG_CHECKING([[whether preprocessor supports #pragma once]])
 AC_PREPROC_IFELSE(
  [AC_LANG_PROGRAM([[#pragma once]])],
  [
    AC_MSG_RESULT([yes])
    AC_DEFINE([HAVE_PRAGMA_ONCE], [1], [Preprocessor support for #pragma once])
  ],
 [AC_MSG_RESULT([no])])
-AX_OPENMP([], [with_openmp="no"])
+AC_AGI_COMPILE([pragma once], [pragma_once], [], [],[
-AM_CONDITIONAL([HAVE_OPENMP], [test "$with_openmp" != "no"])
+#pragma once
 int main(void) {}
 ])
 if test "$agi_cv_pragma_once" = "no"; then
    AC_MSG_FAILURE([Aegisub requires #pragma once to work correctly.])
 fi
 AX_OPENMP([with_openmp="yes"], [with_openmp="no"])
 AC_SUBST(with_openmp)
 AC_SUBST(OPENMP_CXXFLAGS)
 AC_CHECK_HEADERS([sys/time.h])
@ -527,8 +533,7 @@ if test "$with_alsa" != "no"; then
  AC_DEFINE(WITH_ALSA, 1, [Enable ALSA Support])
  found_audio_player="yes"
 fi
-
+AC_SUBST(with_alsa)
 AM_CONDITIONAL([HAVE_ALSA], [test "$with_alsa" != "no"])
 AC_SUBST(ALSA_LDFLAGS)
@ -562,7 +567,7 @@ if test "$agi_cv_with_portaudio" = "yes" && test "$with_portaudio" = "yes"; then
  found_audio_player="yes"
 fi
-AM_CONDITIONAL([HAVE_PORTAUDIO], [test "$with_portaudio" != "no"])
+AC_SUBST(with_portaudio)
 #############
@ -595,7 +600,7 @@ if test "$agi_cv_with_pulseaudio" = "yes" && test "$with_pulseaudio" = "yes"; th
  found_audio_player="yes"
 fi
-AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"])
+AC_SUBST(with_pulseaudio)
 #########
@ -603,7 +608,14 @@ AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "$with_pulseaudio" != "no"])
 #########
 AC_ARG_WITH(openal,[  --without-openal        build without OpenAL audio provider.
                          (default: auto)], openal_disabled="(disabled)")
-if test "$with_openal" != "no"; then
+
 if test "$build_darwin" = "yes"; then
  OPENAL_LIBS="-framework OpenAL"
  OPENAL_CFLAGS=""
  AC_SUBST(OPENAL_LIBS)
  AC_SUBST(OPENAL_CFLAGS)
  with_openal="yes"
 elif test "$with_openal" != "no"; then
  PKG_CHECK_MODULES(OPENAL, openal >= 0.0.8, [with_openal=yes], [with_openal=no])
 fi
@ -635,7 +647,7 @@ if test "$agi_cv_with_openal" = "yes" && test "$with_openal" = "yes"; then
  AC_DEFINE(WITH_OPENAL, 1, [Enable OpenAL support])
 fi
-AM_CONDITIONAL([HAVE_OPENAL], [test "$with_openal" != "no"])
+AC_SUBST(with_openal)
 ######
@ -657,7 +669,7 @@ if test "$with_oss" != "no"; then
  AC_DEFINE(WITH_OSS, 1, [Enable OSS support])
 fi
-AM_CONDITIONAL([HAVE_OSS], [test "$with_oss" != "no"])
+AC_SUBST(with_oss)
 #########################
@ -731,7 +743,7 @@ if test "$agi_cv_with_ffmpeg" = "no" || test "$with_ffmpeg" = "no"; then
  with_ffmpeg="no"
 fi
-AM_CONDITIONAL([HAVE_FFMPEG], [test "$agi_cv_with_ffmpeg" = "yes"])
+AC_SUBST(agi_cv_with_ffmpeg)
 AC_SUBST(LIBAVFORMAT_LIBS)
 AC_SUBST(LIBAVFORMAT_CFLAGS)
 AC_SUBST(LIBAVCODEC_LIBS)
@ -772,7 +784,7 @@ else
  with_provider_ffmpegsource="no"
 fi
-AM_CONDITIONAL([HAVE_PROVIDER_FFMPEGSOURCE], [test "$with_provider_ffmpegsource" = "yes"])
+AC_SUBST(with_provider_ffmpegsource)
 AC_SUBST(LIBPOSTPROC_LIBS)
 AC_SUBST(LIBPOSTPROC_CFLAGS)
@ -786,6 +798,8 @@ AC_ARG_WITH(external-libass, [  --with-external-libass  link to external libass
 if test "$enable_libass" != "no"; then
  if test "$with_external_libass" != "yes"; then
    with_external_libass="no"
    if test "$agi_cv_with_iconv" = "yes"; then
      LIBASS_LIBS="-L../libass -lass_aegisub"
      LIBASS_CFLAGS="-I../libass"
@ -805,28 +819,12 @@ else
  with_libass="no"
 fi
-AM_CONDITIONAL([WITH_LIBASS], [test "$with_libass" = "yes"])
+AC_SUBST(with_libass)
-AM_CONDITIONAL([WITH_INTERNAL_LIBASS], [test "$with_libass" = "yes" && test "$with_external_libass" != "yes"])
+AC_SUBST(with_external_libass)
 AC_SUBST(LIBASS_LIBS)
 AC_SUBST(LIBASS_CFLAGS)
 AC_ARG_ENABLE(csri, [  --disable-csri          disable CSRI (ASA) support (default=enabled)], csri_disabled="(disabled)")
 if test "$enable_csri" != "no"; then
  PKG_CHECK_MODULES(CSRI, csri >= 0.1.0, with_csri="yes", with_csri="no")
  PKG_CHECK_MODULES(ASA, asa >= 0.3.2, with_asa="yes", with_asa="no")
  if test "$with_csri" = "yes" && test "$with_asa" = "yes"; then
    AC_DEFINE(WITH_CSRI, 1, [Enable CSRI (ASA) Subtitle Provider])
  fi
 else
  with_csri="no"
 fi
 AM_CONDITIONAL([WITH_CSRI], [test "$with_csri" = "yes"])
 ###########
 ## Hunspell
 ###########
@ -853,7 +851,7 @@ if test "$agi_cv_with_hunspell" = "yes" && test "$with_hunspell" = "yes"; then
  AC_DEFINE(WITH_HUNSPELL, 1, [Enable Hunspell support.])
 fi
-AM_CONDITIONAL([HAVE_HUNSPELL], [test "$with_hunspell" != "no"])
+AC_SUBST(with_hunspell)
@ -894,14 +892,15 @@ fi
 LIBS="$aegisub_save_LIBS"
 if test "$agi_cv_with_lua" = "yes"; then
  with_auto4="yes"
  with_automation="yes"
  with_auto4_lua="yes"
  AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua])
 else
-  with_auto4="no"
+  with_automation="no"
  with_auto4_lua="no"
 fi
-AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"])
+AC_SUBST(with_auto4_lua)
 AC_SUBST(LUA_CFLAGS)
 AC_SUBST(LUA_LDFLAGS)
@ -909,7 +908,7 @@ AC_SUBST(LUA_LDFLAGS)
 if test "$with_automation" = "yes"; then
  AC_DEFINE(WITH_AUTOMATION, 1, [Enable Automation support, requires any automation language.])
 fi  
-AM_CONDITIONAL([HAVE_AUTOMATION], [test "$with_automation" = "yes"])
+AC_SUBST(with_automation)
@ -972,7 +971,7 @@ if test "$enable_gcc_prec" = "yes"; then
 else
  AC_MSG_RESULT([no])
 fi
-AM_CONDITIONAL([PRECOMPILED_HEADER], [test "$enable_gcc_prec" = "yes"])
+AC_SUBST(enable_gcc_prec)
 ######################################################
@ -1120,11 +1119,26 @@ if test "$enable_efence" = "yes" && test "$enable_ccmalloc" = "yes"; then
 fi  
 ########
 # ccache
 ########
 AC_MSG_CHECKING([whether to enable ccache])
 AC_ARG_ENABLE(ccache, [  --enable-ccache         enable ccache (default=no)])
 if test "$enable_ccache" = "yes"; then
  AC_MSG_RESULT([yes])
 else
  enable_ccache="no"
  AC_MSG_RESULT([no])
 fi
 AC_SUBST(enable_ccache)
 ##############################
 # Internationalisation support
 ##############################
-AC_PROG_INTLTOOL
+# Avoid checking for config.rpath, we're not using automake.
-AM_GLIB_GNU_GETTEXT
+define([AC_LIB_RPATH], [:])
 AM_GNU_GETTEXT([external])
 if test "$build_darwin" = "yes"; then
  GETTEXT_PACKAGE="aegisub"
@ -1177,8 +1191,6 @@ if ! test -z "$with_provider_subtitle"; then
 else
  if test "$with_libass" = "yes"; then
    default_provider_subtitle="libass"
  elif test "$with_csri" = "yes"; then
    default_provider_subtitle="csri"
  fi
 fi
 AC_DEFINE_UNQUOTED([DEFAULT_PROVIDER_SUBTITLE], ["$default_provider_subtitle"], [Default Subtitle Provider.])
@ -1225,32 +1237,15 @@ fi
 ###############
 # Misc settings 
 ###############
-AM_CONDITIONAL([FOUND_AUDIO_PLAYER], [test "$found_audio_player" = "yes"])
+AC_SUBST(found_audio_player)
-AM_CONDITIONAL([FOUND_VIDEO_PROVIDER], [test "$found_video_provider" = "yes"])
+AC_SUBST(found_audio_provider)
-
+AC_SUBST(found_video_provider)
 # Makefiles
 AC_CONFIG_FILES([
 Makefile
 automation/Makefile
 desktop/Makefile
 libaegisub/Makefile
 libass/Makefile
 libffms/Makefile
 po/Makefile.in
 reporter/Makefile
 src/Makefile
 src/bitmaps/Makefile
 src/libresrc/Makefile
 tools/Makefile
 universalchardet/Makefile
 tests/Makefile
 ])
 # Files that need substitution.
 AC_CONFIG_FILES([
 desktop/aegisub.desktop
 tools/osx-bundle.sed
 Makefile.inc
 ])
 AC_OUTPUT
@ -1305,7 +1300,7 @@ Default Settings
  Audio Player:          $default_player_audio
 Scripting Engines
-  auto4 Lua:             $with_auto4 $lua51_disabled
+  auto4 Lua:             $with_auto4_lua $lua51_disabled
 Audio Players
  ALSA:                  $with_alsa $alsa_disabled
@ -1322,7 +1317,6 @@ A/V Providers
  FFmpegSource:          $with_provider_ffmpegsource $ffmpegsource_provider_disabled
 Subtitle Providers:
  CSRI (ASA):            $with_csri $csri_disabled $csri_default
  libASS                 $with_libass $libass_disabled $libass_default
                         (both require iconv and fontconfig)
--- a/aegisub/desktop/16x16/apps/aegisub.png
+++ b/aegisub/desktop/16x16/apps/aegisub.png
--- a/aegisub/desktop/22x22/apps/aegisub.png
+++ b/aegisub/desktop/22x22/apps/aegisub.png
--- a/aegisub/desktop/24x24/apps/aegisub.png
+++ b/aegisub/desktop/24x24/apps/aegisub.png
--- a/aegisub/desktop/32x32/apps/aegisub.png
+++ b/aegisub/desktop/32x32/apps/aegisub.png
--- a/aegisub/desktop/48x48/apps/aegisub.png
+++ b/aegisub/desktop/48x48/apps/aegisub.png
--- a/aegisub/desktop/64x64/apps/aegisub.png
+++ b/aegisub/desktop/64x64/apps/aegisub.png
--- a/aegisub/desktop/Makefile
+++ b/aegisub/desktop/Makefile
@ -0,0 +1,51 @@
 include ../Makefile.inc
 applicationsdir = $(DESKTOP_DATADIR)/applications
 applications_DATA = aegisub.desktop
 iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps
 iconsscalable_DATA = scalable/aegisub.svg
 all: ;
 ICON_HICOLOR = \
 	16x16/apps/aegisub.png \
 	22x22/apps/aegisub.png \
 	24x24/apps/aegisub.png \
 	32x32/apps/aegisub.png \
 	48x48/apps/aegisub.png \
 	64x64/apps/aegisub.png
 ICON_SCALABLE = \
 	scalable/apps/aegisub.svg
 DESKTOP_FILE = \
 	aegisub.desktop
 EXTRA_DIST = \
 	aegisub.desktop.in \
 	$(ICON_HICOLOR) \
 	$(ICON_SCALABLE)
 install: install-desktop install-icons
 install-desktop:
 	@$(BIN_MKDIR) -p $(P_DESKTOP)
 	$(BIN_INSTALL) $(DESKTOP_FILE) $(P_DESKTOP)/$(DESKTOP_FILE)
 install-icons:
 	@$(BIN_MKDIR) -p $(addprefix $(P_ICON)/hicolor/, $(dir $(ICON_HICOLOR)))
 	@for i in $(ICON_HICOLOR); do \
 		$(BIN_ECHO) "$(BIN_INSTALL) $$i $(P_ICON)/hicolor/$$i"; \
 		$(BIN_INSTALL) $$i $(P_ICON)/hicolor/$$i; \
 	done
 	$(BIN_TOUCH) $(P_ICON)/hicolor
 	$(BIN_MKDIR) -p $(P_ICON)/hicolor/scalable/apps
 	$(BIN_CP) $(ICON_SCALABLE) $(P_ICON)/hicolor/$(ICON_SCALABLE)
 CLEANFILES = aegisub.desktop
 include ../Makefile.target
--- a/aegisub/desktop/Makefile.am
+++ b/aegisub/desktop/Makefile.am
@ -1,45 +0,0 @@
 if DESKTOP_DATADIR
 applicationsdir = $(DESKTOP_DATADIR)/applications
 applications_DATA = aegisub.desktop
 iconsscalabledir = $(DESKTOP_DATADIR)/icons/hicolor/scalable/apps
 iconsscalable_DATA = scalable/aegisub.svg
 install-data-hook:
 	touch "$(DESTDIR)$(DESKTOP_DATADIR)/icons/hicolor"
 icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
 icons16_DATA = 16x16/aegisub.png
 icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps
 icons22_DATA = 22x22/aegisub.png
 icons24dir = $(DESKTOP_DATADIR)/icons/hicolor/24x24/apps
 icons24_DATA = 24x24/aegisub.png
 icons32dir = $(DESKTOP_DATADIR)/icons/hicolor/32x32/apps
 icons32_DATA = 32x32/aegisub.png
 icons48dir = $(DESKTOP_DATADIR)/icons/hicolor/48x48/apps
 icons48_DATA = 48x48/aegisub.png
 icons64dir = $(DESKTOP_DATADIR)/icons/hicolor/64x64/apps
 icons64_DATA = 64x64/aegisub.png
 endif
 EXTRA_DIST = \
 	aegisub.desktop.in \
 	16x16/aegisub.png \
 	22x22/aegisub.png \
 	24x24/aegisub.png \
 	32x32/aegisub.png \
 	48x48/aegisub.png \
 	64x64/aegisub.png \
 	scalable/aegisub.svg
 DISTCLEANFILES = aegisub.desktop
--- a/aegisub/desktop/scalable/apps/aegisub.svg
+++ b/aegisub/desktop/scalable/apps/aegisub.svg
--- a/aegisub/install-sh
+++ b/aegisub/install-sh
@ -0,0 +1,519 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 scriptversion=2006-12-25.00
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
 # deal in the Software without restriction, including without limitation the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 chgrpprog=${CHGRPPROG-chgrp}
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 posix_glob='?'
 initialize_posix_glob='
  test "$posix_glob" != "?" || {
    if (set -f) 2>/dev/null; then
      posix_glob=
    else
      posix_glob=:
    fi
  }
 '
 posix_mkdir=
 # Desired mode of installed file.
 mode=0755
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
 stripcmd=
 src=
 dst=
 dir_arg=
 dst_arg=
 copy_on_change=false
 no_target_directory=
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
   or: $0 [OPTION]... SRCFILES... DIRECTORY
   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
   or: $0 [OPTION]... -d DIRECTORIES...
 In the 1st form, copy SRCFILE to DSTFILE.
 In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 Options:
     --help     display this help and exit.
     --version  display version info and exit.
  -c            (ignored)
  -C            install only if different (preserve the last data modification time)
  -d            create directories instead of installing files.
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
 Environment variables override the default commands:
  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
  RMPROG STRIPPROG
 "
 while test $# -ne 0; do
  case $1 in
    -c) ;;
    -C) copy_on_change=true;;
    -d) dir_arg=true;;
    -g) chgrpcmd="$chgrpprog $2"
 	shift;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
 	shift;;
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
 	shift;;
    -T) no_target_directory=true;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
  shift
 done
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst;;
    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
 	      # Remove any dirs left behind by ancient mkdir implementations.
 	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
 	    fi
 	    trap '' 0;;
 	esac;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix='/';;
 	-*) prefix='./';;
 	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
 	# Now remove or move aside any old file at destination location.
 	# We try this two ways since rm can't unlink itself on some
 	# systems and the destination file might be busy for other
 	# reasons.  In this case, the final cleanup might fail but the new
 	# file should still install successfully.
 	{
 	  test ! -f "$dst" ||
 	  $doit $rmcmd -f "$dst" 2>/dev/null ||
 	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
 	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
 	  } ||
 	  { echo "$0: cannot unlink or rename $dst" >&2
 	    (exit 1); exit 1
 	  }
 	} &&
 	# Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
    trap '' 0
  fi
 done
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-end: "$"
 # End:
--- a/aegisub/libaegisub/Makefile
+++ b/aegisub/libaegisub/Makefile
@ -0,0 +1,47 @@
 # $Id$
 include ../Makefile.inc
 LIB_SHARED = libaegisub-3.0.so
 LIB_SHARED_INSTALL = yes
 LIB_VERSION = 3
 CXXFLAGS = -Iinclude -I../src -I.. -pedantic -DLAGI -fPIC
 PRECOMPILED_HEADER_NAME = lagi_pre.h
 lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
 ifeq (yes, $(BUILD_DARWIN))
 CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/
 LDFLAGS += -L../universalchardet -luniversalchardet
 endif
 SRC = \
 	common/charset.cpp \
 	common/charset_conv.cpp \
 	common/charset_ucd.cpp \
 	common/mru.cpp \
 	common/option.cpp \
 	common/option_value.cpp \
 	common/option_visit.cpp \
 	common/log.cpp \
 	common/validator.cpp \
 	common/vfr.cpp \
 	unix/util.cpp \
 	unix/io.cpp \
 	unix/access.cpp \
 	unix/log.cpp
 ifeq (yes, $(BUILD_DARWIN))
 SRC += \
 	osx/util.cpp
 endif
 HEADERS = \
 	*/*.h \
 	include/aegisub/*.h \
 	include/aegisub/cajun/*.h
 include ../Makefile.target
--- a/aegisub/libaegisub/Makefile.am
+++ b/aegisub/libaegisub/Makefile.am
@ -1,50 +0,0 @@
 # $Id$
 AUTOMAKE_OPTIONS = subdir-objects
 AM_CXXFLAGS=
 DISTCLEANFILES=
 lib_LTLIBRARIES = libaegisub-3.0.la
 libaegisub_3_0_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI
 AM_LDFLAGS = @ICONV_LDFLAGS@
 if PRECOMPILED_HEADER
 BUILT_SOURCES = lagi_pre.h.gch
 AM_CXXFLAGS += -include lagi_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
 nodist_libaegisub_3_0_la_SOURCES = lagi_pre.h.gch
 endif
 if PRECOMPILED_HEADER
 # This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
 lagi_pre.h.gch: lagi_pre.h
 	@CXX@ $(libaegisub_3_0_la_CPPFLAGS) @CXXFLAGS@ @DEBUG_FLAGS@ -fPIC -DPIC lagi_pre.h
 DISTCLEANFILES += lagi_pre.h.gch
 endif
 if BUILD_DARWIN
 AM_CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/
 AM_LDFLAGS += -L../universalchardet -luniversalchardet
 endif
 libaegisub_3_0_la_SOURCES = \
 	common/charset.cpp \
 	common/charset_conv.cpp \
 	common/charset_ucd.cpp \
 	common/mru.cpp \
 	common/option.cpp \
 	common/option_value.cpp \
 	common/option_visit.cpp \
 	common/log.cpp \
 	common/validator.cpp \
 	common/vfr.cpp \
 	unix/util.cpp \
 	unix/io.cpp \
 	unix/access.cpp \
 	unix/log.cpp
 if BUILD_DARWIN
 libaegisub_3_0_la_SOURCES += \
 	osx/util.cpp
 endif
 noinst_HEADERS = *.h
--- a/aegisub/libass/Makefile
+++ b/aegisub/libass/Makefile
@ -0,0 +1,23 @@
 include ../Makefile.inc
 CXXFLAGS += -DCONFIG_ICONV -DCONFIG_FONTCONFIG $(CFLAGS_FREETYPE) $(CFLAGS_ICONV) $(CFLAGS_FONTCONFIG)
 LIB = libass_aegisub.a
 SRC = \
 	ass.c \
 	ass_bitmap.c \
 	ass_cache.c \
 	ass_drawing.c \
 	ass_font.c \
 	ass_fontconfig.c \
 	ass_library.c \
 	ass_parse.c \
 	ass_render.c \
 	ass_render_api.c \
 	ass_strtod.c \
 	ass_utils.c
 HEADER = *.h
 include ../Makefile.target
--- a/aegisub/libass/Makefile.am
+++ b/aegisub/libass/Makefile.am
@ -1,24 +0,0 @@
 noinst_LIBRARIES = libass_aegisub.a
 AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@
 if BUILD_DARWIN
 AM_CPPFLAGS += -DBUILD_DARWIN
 endif
 libass_aegisub_a_SOURCES = \
 	ass.c \
 	ass_bitmap.c \
 	ass_cache.c \
 	ass_drawing.c \
 	ass_font.c \
 	ass_fontconfig.c \
 	ass_library.c \
 	ass_parse.c \
 	ass_render.c \
 	ass_render_api.c \
 	ass_strtod.c \
 	ass_utils.c
 libass_aegisub_a_SOURCES += \
 	*.h
--- a/aegisub/libffms/Makefile.am
+++ b/aegisub/libffms/Makefile.am
@ -1,11 +1,11 @@
-AUTOMAKE_OPTIONS = subdir-objects
+include ../Makefile.inc
-noinst_LIBRARIES = libffmpegsource_aegisub.a
+CXXFLAGS = -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY -D__STDC_CONSTANT_MACROS
 CXXFLAGS += $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
-AM_CPPFLAGS = -Icore -Iinclude -D__UNIX__ -DFFMS_EXPORTS -DHAVE_STRLCPY -D__STDC_CONSTANT_MACROS @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
+LIB = libffmpegsource_aegisub.a
-
+SRC = \
 libffmpegsource_aegisub_a_SOURCES = \
 	src/core/audiosource.cpp \
 	src/core/ffms.cpp \
 	src/core/indexing.cpp \
@ -21,6 +21,11 @@ libffmpegsource_aegisub_a_SOURCES = \
 	src/core/videosource.cpp \
 	src/core/wave64writer.cpp
-libffmpegsource_aegisub_a_SOURCES += \
+HEADER = \
 	src/core/*.h \
 	include/*.h
 include ../Makefile.target
--- a/aegisub/po/ChangeLog
+++ b/aegisub/po/ChangeLog
--- a/aegisub/po/LINGUAS
+++ b/aegisub/po/LINGUAS
@ -1,17 +0,0 @@
 ca
 cs
 da
 de
 el
 es
 fi
 fr_FR
 hu
 it
 ja
 ko
 pt_BR
 ru
 vi
 zh_CN
 zh_TW
--- a/aegisub/po/Makefile
+++ b/aegisub/po/Makefile
@ -0,0 +1,41 @@
 include ../Makefile.inc
 .SUFFIXES: .po .mo
 PO = \
 	ca.po \
 	cs.po \
 	da.po \
 	de.po \
 	el.po \
 	es.po \
 	fi.po \
 	fr_FR.po \
 	hu.po \
 	it.po \
 	ja.po \
 	ko.po \
 	pt_BR.po \
 	ru.po \
 	vi.po \
 	zh_CN.po \
 	zh_TW.po
 MO = $(addsuffix .mo, $(basename $(PO)))
 all: $(MO)
 %.mo: %.po
 	$(BIN_MSGFMT) -o $@ $<
 install:
 	@$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(P_LOCALE)/, $(basename $(PO))))
 	@for i in $(basename $(PO)); do \
 		echo $(BIN_INSTALL) $$i.mo $(P_LOCALE)/$$i/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 		$(BIN_INSTALL) $$i.mo $(P_LOCALE)/$$i/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
 	done
 CLEANFILES = $(MO)
 include ../Makefile.target
--- a/aegisub/po/Makevars
+++ b/aegisub/po/Makevars
@ -1,11 +0,0 @@
 DOMAIN = aegisub
 subdir = po
 top_builddir = ..
 XGETTEXT_OPTIONS = -C -k_
 COPYRIGHT_HOLDER = Rodrigo Braz Monteiro
 MSGID_BUGS_ADDRESS =
 EXTRA_LOCALE_CATEGORIES =
--- a/aegisub/po/POTFILES.in
+++ b/aegisub/po/POTFILES.in
@ -1,505 +0,0 @@
 MatroskaParser.h
 VideoSink.cpp
 VideoSink.cpp
 VideoSink.h
 aegisub_endian.h
 aegisublocale.cpp
 aegisublocale.cpp
 aegisublocale.h
 agi_pre.cpp
 agi_pre.cpp
 agi_pre.h
 ass_attachment.cpp
 ass_attachment.cpp
 ass_attachment.h
 ass_dialogue.cpp
 ass_dialogue.cpp
 ass_dialogue.h
 ass_entry.cpp
 ass_entry.cpp
 ass_entry.h
 ass_export_filter.cpp
 ass_export_filter.cpp
 ass_export_filter.h
 ass_exporter.cpp
 ass_exporter.cpp
 ass_exporter.h
 ass_file.cpp
 ass_file.cpp
 ass_file.h
 ass_karaoke.cpp
 ass_karaoke.cpp
 ass_karaoke.h
 ass_override.cpp
 ass_override.cpp
 ass_override.h
 ass_style.cpp
 ass_style.cpp
 ass_style.h
 ass_style_storage.cpp
 ass_style_storage.cpp
 ass_style_storage.h
 ass_time.cpp
 ass_time.cpp
 ass_time.h
 audio_box.cpp
 audio_box.cpp
 audio_box.h
 audio_display.cpp
 audio_display.cpp
 audio_display.h
 audio_karaoke.cpp
 audio_karaoke.cpp
 audio_karaoke.h
 audio_player.cpp
 audio_player.cpp
 audio_player_alsa.cpp
 audio_player_alsa.cpp
 audio_player_alsa.h
 audio_player_dsound.cpp
 audio_player_dsound.cpp
 audio_player_dsound.h
 audio_player_dsound2.cpp
 audio_player_dsound2.h
 audio_player_manager.h
 audio_player_openal.cpp
 audio_player_openal.cpp
 audio_player_openal.h
 audio_player_portaudio.cpp
 audio_player_portaudio.cpp
 audio_player_portaudio.h
 audio_player_pulse.cpp
 audio_player_pulse.cpp
 audio_player_pulse.h
 audio_provider.cpp
 audio_provider.cpp
 audio_provider_avs.cpp
 audio_provider_avs.cpp
 audio_provider_avs.h
 audio_provider_convert.cpp
 audio_provider_convert.h
 audio_provider_downmix.cpp
 audio_provider_downmix.h
 audio_provider_dummy.cpp
 audio_provider_dummy.h
 audio_provider_ffmpegsource.cpp
 audio_provider_ffmpegsource.h
 audio_provider_hd.cpp
 audio_provider_hd.cpp
 audio_provider_hd.h
 audio_provider_lavc.cpp
 audio_provider_lavc.cpp
 audio_provider_lavc.h
 audio_provider_manager.h
 audio_provider_pcm.cpp
 audio_provider_pcm.h
 audio_provider_ram.cpp
 audio_provider_ram.cpp
 audio_provider_ram.h
 audio_provider_stream.cpp
 audio_provider_stream.cpp
 audio_provider_stream.h
 audio_spectrum.cpp
 audio_spectrum.cpp
 audio_spectrum.h
 auto4_auto3.cpp
 auto4_auto3.cpp
 auto4_auto3.h
 auto4_auto3_factory.h
 auto4_base.cpp
 auto4_base.cpp
 auto4_base.h
 auto4_lua.cpp
 auto4_lua.cpp
 auto4_lua.h
 auto4_lua_assfile.cpp
 auto4_lua_assfile.cpp
 auto4_lua_dialog.cpp
 auto4_lua_dialog.cpp
 auto4_lua_factory.h
 auto4_lua_scriptreader.cpp
 auto4_lua_scriptreader.cpp
 auto4_lua_scriptreader.h
 auto4_perl.cpp
 auto4_perl.h
 auto4_perl_ass.cpp
 auto4_perl_console.cpp
 auto4_perl_console.h
 auto4_perl_dialogs.cpp
 auto4_perl_factory.h
 auto4_perl_script.cpp
 auto4_ruby.cpp
 auto4_ruby.cpp
 auto4_ruby.h
 auto4_ruby_assfile.cpp
 auto4_ruby_assfile.cpp
 auto4_ruby_dialog.cpp
 auto4_ruby_dialog.cpp
 auto4_ruby_factory.h
 avisynth.h
 avisynth_wrap.cpp
 avisynth_wrap.cpp
 avisynth_wrap.h
 base_grid.cpp
 base_grid.cpp
 base_grid.h
 browse_button.cpp
 browse_button.cpp
 browse_button.h
 charset_detect.cpp
 charset_detect.cpp
 charset_detect.h
 colorspace.cpp
 colorspace.cpp
 colorspace.h
 colour_button.cpp
 colour_button.cpp
 colour_button.h
 dialog_about.cpp
 dialog_about.cpp
 dialog_about.h
 dialog_associations.cpp
 dialog_associations.cpp
 dialog_associations.h
 dialog_attachments.cpp
 dialog_attachments.cpp
 dialog_attachments.h
 dialog_automation.cpp
 dialog_automation.cpp
 dialog_automation.h
 dialog_colorpicker.cpp
 dialog_colorpicker.cpp
 dialog_colorpicker.h
 dialog_detached_video.cpp
 dialog_detached_video.cpp
 dialog_detached_video.h
 dialog_dummy_video.cpp
 dialog_dummy_video.cpp
 dialog_dummy_video.h
 dialog_export.cpp
 dialog_export.cpp
 dialog_export.h
 dialog_fonts_collector.cpp
 dialog_fonts_collector.cpp
 dialog_fonts_collector.h
 dialog_jumpto.cpp
 dialog_jumpto.cpp
 dialog_jumpto.h
 dialog_kanji_timer.cpp
 dialog_kanji_timer.cpp
 dialog_kanji_timer.h
 dialog_options.cpp
 dialog_options.cpp
 dialog_options.h
 dialog_paste_over.cpp
 dialog_paste_over.cpp
 dialog_paste_over.h
 dialog_progress.cpp
 dialog_progress.cpp
 dialog_progress.h
 dialog_properties.cpp
 dialog_properties.cpp
 dialog_properties.h
 dialog_resample.cpp
 dialog_resample.cpp
 dialog_resample.h
 dialog_search_replace.cpp
 dialog_search_replace.cpp
 dialog_search_replace.h
 dialog_selection.cpp
 dialog_selection.cpp
 dialog_selection.h
 dialog_shift_times.cpp
 dialog_shift_times.cpp
 dialog_shift_times.h
 dialog_spellchecker.cpp
 dialog_spellchecker.cpp
 dialog_spellchecker.h
 dialog_splash.cpp
 dialog_splash.cpp
 dialog_splash.h
 dialog_style_editor.cpp
 dialog_style_editor.cpp
 dialog_style_editor.h
 dialog_style_manager.cpp
 dialog_style_manager.cpp
 dialog_style_manager.h
 dialog_styling_assistant.cpp
 dialog_styling_assistant.cpp
 dialog_styling_assistant.h
 dialog_text_import.cpp
 dialog_text_import.h
 dialog_timing_processor.cpp
 dialog_timing_processor.cpp
 dialog_timing_processor.h
 dialog_tip.cpp
 dialog_tip.cpp
 dialog_tip.h
 dialog_translation.cpp
 dialog_translation.cpp
 dialog_translation.h
 dialog_version_check.cpp
 dialog_version_check.cpp
 dialog_version_check.h
 dialog_video_details.cpp
 dialog_video_details.h
 drop.cpp
 drop.cpp
 drop.h
 export_clean_info.cpp
 export_clean_info.cpp
 export_clean_info.h
 export_fixstyle.cpp
 export_fixstyle.cpp
 export_fixstyle.h
 export_framerate.cpp
 export_framerate.cpp
 export_framerate.h
 export_visible_lines.cpp
 export_visible_lines.cpp
 export_visible_lines.h
 factory_manager.h
 ffmpegsource_common.cpp
 ffmpegsource_common.h
 fft.cpp
 fft.cpp
 fft.h
 float_spin.cpp
 float_spin.cpp
 float_spin.h
 font_file_lister.cpp
 font_file_lister.cpp
 font_file_lister.h
 font_file_lister_fontconfig.cpp
 font_file_lister_fontconfig.h
 font_file_lister_freetype.cpp
 font_file_lister_freetype.h
 frame_main.cpp
 frame_main.cpp
 frame_main.h
 frame_main_events.cpp
 frame_main_events.cpp
 gl/glext.h
 gl_text.cpp
 gl_text.cpp
 gl_text.h
 gl_wrap.cpp
 gl_wrap.cpp
 gl_wrap.h
 help_button.cpp
 help_button.h
 hilimod_textctrl.cpp
 hilimod_textctrl.cpp
 hilimod_textctrl.h
 hotkeys.cpp
 hotkeys.cpp
 hotkeys.h
 idle_field_event.cpp
 idle_field_event.cpp
 idle_field_event.h
 include/aegisub/aegisub.h
 include/aegisub/audio_player.h
 include/aegisub/audio_provider.h
 include/aegisub/spellchecker.h
 include/aegisub/subtitles_provider.h
 include/aegisub/video_provider.h
 kana_table.cpp
 kana_table.cpp
 kana_table.h
 keyframe.cpp
 keyframe.h
 lavc_file.cpp
 lavc_file.cpp
 lavc_file.h
 lavc_keyframes.cpp
 lavc_keyframes.h
 main.cpp
 main.cpp
 main.h
 md5.h
 mkv_wrap.cpp
 mkv_wrap.cpp
 mkv_wrap.h
 options.cpp
 options.cpp
 options.h
 osx_bevelButton.cpp
 osx_bevelButton.h
 plugin_manager.cpp
 plugin_manager.h
 scintilla_text_ctrl.cpp
 scintilla_text_ctrl.cpp
 scintilla_text_ctrl.h
 setup.cpp
 setup.cpp
 spellchecker.cpp
 spellchecker.cpp
 spellchecker_hunspell.cpp
 spellchecker_hunspell.cpp
 spellchecker_hunspell.h
 spellchecker_manager.h
 spline.cpp
 spline.h
 spline_curve.cpp
 spline_curve.h
 standard_paths.cpp
 standard_paths.cpp
 standard_paths.h
 static_bmp.cpp
 static_bmp.cpp
 static_bmp.h
 string_codec.cpp
 string_codec.cpp
 string_codec.h
 subs_edit_box.cpp
 subs_edit_box.cpp
 subs_edit_box.h
 subs_edit_ctrl.cpp
 subs_edit_ctrl.cpp
 subs_edit_ctrl.h
 subs_grid.cpp
 subs_grid.cpp
 subs_grid.h
 subs_preview.cpp
 subs_preview.cpp
 subs_preview.h
 subtitle_format.cpp
 subtitle_format.cpp
 subtitle_format.h
 subtitle_format_ass.cpp
 subtitle_format_ass.cpp
 subtitle_format_ass.h
 subtitle_format_dvd.cpp
 subtitle_format_dvd.h
 subtitle_format_encore.cpp
 subtitle_format_encore.cpp
 subtitle_format_encore.h
 subtitle_format_microdvd.cpp
 subtitle_format_microdvd.cpp
 subtitle_format_microdvd.h
 subtitle_format_mkv.cpp
 subtitle_format_mkv.cpp
 subtitle_format_mkv.h
 subtitle_format_prs.cpp
 subtitle_format_prs.cpp
 subtitle_format_prs.h
 subtitle_format_srt.cpp
 subtitle_format_srt.cpp
 subtitle_format_srt.h
 subtitle_format_transtation.cpp
 subtitle_format_transtation.h
 subtitle_format_ttxt.cpp
 subtitle_format_ttxt.cpp
 subtitle_format_ttxt.h
 subtitle_format_txt.cpp
 subtitle_format_txt.cpp
 subtitle_format_txt.h
 subtitles_provider.cpp
 subtitles_provider.cpp
 subtitles_provider_csri.cpp
 subtitles_provider_csri.cpp
 subtitles_provider_csri.h
 subtitles_provider_libass.cpp
 subtitles_provider_libass.cpp
 subtitles_provider_libass.h
 subtitles_provider_manager.h
 text_file_reader.cpp
 text_file_reader.cpp
 text_file_reader.h
 text_file_writer.cpp
 text_file_writer.cpp
 text_file_writer.h
 thesaurus.cpp
 thesaurus.cpp
 thesaurus.h
 thesaurus_myspell.cpp
 thesaurus_myspell.cpp
 thesaurus_myspell.h
 timeedit_ctrl.cpp
 timeedit_ctrl.cpp
 timeedit_ctrl.h
 toggle_bitmap.cpp
 toggle_bitmap.cpp
 toggle_bitmap.h
 tooltip_manager.cpp
 tooltip_manager.cpp
 tooltip_manager.h
 utils.cpp
 utils.cpp
 utils.h
 validators.cpp
 validators.cpp
 validators.h
 variable_data.cpp
 variable_data.cpp
 variable_data.h
 vector2d.cpp
 vector2d.h
 version.cpp
 version.cpp
 version.h
 vfr.cpp
 vfr.cpp
 vfr.h
 vfw_wrap.cpp
 vfw_wrap.cpp
 vfw_wrap.h
 video_box.cpp
 video_box.cpp
 video_box.h
 video_context.cpp
 video_context.cpp
 video_context.h
 video_display.cpp
 video_display.cpp
 video_display.h
 video_frame.cpp
 video_frame.cpp
 video_frame.h
 video_provider_avs.cpp
 video_provider_avs.cpp
 video_provider_avs.h
 video_provider_cache.cpp
 video_provider_cache.h
 video_provider_dshow.cpp
 video_provider_dshow.cpp
 video_provider_dshow.h
 video_provider_dummy.cpp
 video_provider_dummy.cpp
 video_provider_dummy.h
 video_provider_ffmpegsource.cpp
 video_provider_ffmpegsource.h
 video_provider_lavc.cpp
 video_provider_lavc.cpp
 video_provider_lavc.h
 video_provider_manager.cpp
 video_provider_manager.h
 video_slider.cpp
 video_slider.cpp
 video_slider.h
 visual_feature.cpp
 visual_feature.cpp
 visual_feature.h
 visual_tool.cpp
 visual_tool.cpp
 visual_tool.h
 visual_tool_clip.cpp
 visual_tool_clip.cpp
 visual_tool_clip.h
 visual_tool_cross.cpp
 visual_tool_cross.cpp
 visual_tool_cross.h
 visual_tool_drag.cpp
 visual_tool_drag.cpp
 visual_tool_drag.h
 visual_tool_rotatexy.cpp
 visual_tool_rotatexy.cpp
 visual_tool_rotatexy.h
 visual_tool_rotatez.cpp
 visual_tool_rotatez.cpp
 visual_tool_rotatez.h
 visual_tool_scale.cpp
 visual_tool_scale.cpp
 visual_tool_scale.h
 visual_tool_vector_clip.cpp
 visual_tool_vector_clip.h
--- a/aegisub/po/README_ja.txt
+++ b/aegisub/po/README_ja.txt
--- a/aegisub/po/make_pot.bat
+++ b/aegisub/po/make_pot.bat
@ -1,4 +0,0 @@
 del /s list.txt
 dir /w /b ..\aegisub\*.cpp ..\aegisub\*.h >> list.txt
 "C:\Program Files (x86)\GnuWin32\bin\xgettext.exe" --files-from=list.txt --directory=../aegisub/ --output=aegisub.pot --c++ -k_
 pause
--- a/aegisub/po/mkwin32layout.py
+++ b/aegisub/po/mkwin32layout.py
@ -1,19 +0,0 @@
 import shutil
 import os
 destpath = "../locale"
 os.mkdir(destpath)
 for lang in file("LINGUAS").readlines():
 	lang = lang.strip()
 	langpath = destpath + "/" + lang
 	os.mkdir(langpath)
 	shutil.copyfile(lang + ".po", langpath + "/aegisub.po")
 	if os.access("wxstd-" + lang + ".mo", os.R_OK):
 		shutil.copyfile("wxstd-" + lang + ".mo", langpath + "/wxstd.mo")
 	if os.access(lang + ".gmo", os.R_OK):
 		shutil.copyfile(lang + ".gmo", langpath + "/aegisub.mo")
 	else:
 		shutil.copyfile(lang + ".mo", langpath + "/aegisub.mo")
--- a/aegisub/reporter/Makefile
+++ b/aegisub/reporter/Makefile
@ -0,0 +1,57 @@
 include ../Makefile.inc
 PROGRAM = reporter-3.0
 PROGRAM_INSTALL = yes
 PRECOMPILED_HEADER_NAME=r_pre.h
 #if PRECOMPILED_HEADER
 #BUILT_SOURCES = r_pre.h.gch
 #AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
 #nodist_reporter_3_0_SOURCES = r_prec.h.gch
 #endif
 CXXFLAGS += -Iinclude $(CFLAGS_WX)
 LDFLAGS += $(LDFLAGS_WX) $(LDFLAGS_LIBCURL)
 #if PRECOMPILED_HEADER
 ## This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
 #r_pre.h.gch: r_pre.h
 #	@CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ r_pre.h
 #DISTCLEANFILES += r_pre.h.gch
 #endif
 # File-specific flags
 upload.o: CXXFLAGS += $(CFLAGS_CURL)
 SRC = \
 	aegisub.cpp \
 	main.cpp \
 	name_map.cpp \
 	platform.cpp \
 	platform_unix.cpp \
 	progress.cpp \
 	report.cpp \
 	upload.cpp \
 	view.cpp
 ifeq (yes, $(BUILD_BSD))
 SRC += platform_unix_bsd.cpp
 endif
 ifeq (yes, $(BUILD_LINUX))
 SRC += platform_unix_linux.cpp
 endif
 ifeq (yes, $(BUILD_DARWIN))
 SRC += platform_unix_osx.cpp
 endif
 HEADER = \
 	*.h \
 	include/*.h
 include ../Makefile.target
--- a/aegisub/reporter/Makefile.am
+++ b/aegisub/reporter/Makefile.am
@ -1,51 +0,0 @@
 AUTOMAKE_OPTIONS = foreign
 AM_CXXFLAGS =
 DISTCLEANFILES =
 bin_PROGRAMS = reporter-3.0
 if PRECOMPILED_HEADER
 BUILT_SOURCES = r_pre.h.gch
 AM_CXXFLAGS += -include r_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
 nodist_reporter_3_0_SOURCES = r_prec.h.gch
 endif
 reporter_3_0_CPPFLAGS = -Iinclude @LIBCURL_CFLAGS@ @WX_CPPFLAGS@
 reporter_3_0_LDFLAGS = @WX_LIBS@ @LIBCURL_LIBS@
 if PRECOMPILED_HEADER
 # This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
 r_pre.h.gch: r_pre.h
 	@CXX@ @WX_CPPFLAGS@ @CXXFLAGS@ @DEBUG_FLAGS@ r_pre.h
 DISTCLEANFILES += r_pre.h.gch
 endif
 reporter_3_0_SOURCES = \
 	aegisub.cpp \
 	main.cpp \
 	name_map.cpp \
 	platform.cpp \
 	platform_unix.cpp \
 	progress.cpp \
 	report.cpp \
 	upload.cpp \
 	view.cpp
 if BUILD_BSD
 reporter_3_0_SOURCES += platform_unix_bsd.cpp
 endif
 if BUILD_LINUX
 reporter_3_0_SOURCES += platform_unix_linux.cpp
 endif
 if BUILD_DARWIN
 reporter_3_0_SOURCES += platform_unix_osx.cpp
 endif
 reporter_3_0_SOURCES += \
 	*.h \
 	include/*.h
--- a/aegisub/src/Makefile
+++ b/aegisub/src/Makefile
@ -0,0 +1,274 @@
 include ../Makefile.inc
 PROGRAM = aegisub-3.0
 PROGRAM_INSTALL = yes
 PRECOMPILED_HEADER_NAME=agi_pre.h
 SUBDIRS = libresrc
 CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -I. -I..  -Iinclude -I../libaegisub/include $(CPPFLAGS_WX)
 LDFLAGS += -L../libaegisub -laegisub-3.0
 LDFLAGS += $(CFLAGS_DEBUG) $(CFLAGS_PROFILE) $(LDFLAGS_CCMALLOC) $(LDFLAGS_EFENCE)
 LDFLAGS += $(LDFLAGS_GL) $(LDFLAGS_PTHREAD) $(LDFLAGS_WX) $(LDFLAGS_FREETYPE) $(LDFLAGS_FONTCONFIG)
 LDFLAGS_POST += libresrc/libresrc.a $(LDFLAGS_UCHARDET)
 ifdef BUILD_DARWIN
 LDFLAGS += -lz
 endif
 ###############
 # AUDIO PLAYERS
 ###############
 ifeq (yes, $(HAVE_ALSA))
 SRC_OPT += audio_player_alsa.cpp
 audio_player_alsa.o: CXXFLAGS += $(CFLAGS_ALSA)
 LDFLAGS += $(LDFLAGS_ALSA)
 endif
 ifeq (yes, $(HAVE_PORTAUDIO))
 SRC_OPT += audio_player_portaudio.cpp
 audio_player_portaudio.o: CXXFLAGS += $(CFLAGS_PORTAUDIO)
 LDFLAGS += $(LDFLAGS_PORTAUDIO)
 endif
 ifeq (yes, $(HAVE_PULSEAUDIO))
 SRC_OPT += audio_player_pulse.cpp
 audio_player_pulse.o: CXXFLAGS += $(CFLAGS_LIBPULSE)
 LDFLAGS += $(LDFLAGS_LIBPULSE)
 endif
 ifeq (yes, $(HAVE_OPENAL))
 SRC_OPT += audio_player_openal.cpp
 audio_player_openal.o: CXXFLAGS += $(CFLAGS_OPENAL)
 LDFLAGS += $(LDFLAGS_OPENAL)
 endif
 ifeq (yes, $(HAVE_OSS))
 SRC_OPT += audio_player_oss.cpp
 endif
 #######################
 # AUDIO / VIDEO SUPPORT
 #######################
 ifeq (yes, $(HAVE_PROVIDER_FFMPEGSOURCE))
 SRC_OPT += audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
 audio_provider_ffmpegsource.o video_provider_ffmpegsource.o ffmpegsource_common.o: \
 	CXXFLAGS += $(CFLAGS_FFMPEGSOURCE) $(CFLAGS_LIBAVFORMAT) $(CFLAGS_LIBAVCODEC) $(CFLAGS_LIBSWSCALE) $(CFLAGS_LIBAVUTIL) $(CFLAGS_LIBPOSTPROC)
 LDFLAGS += $(LDFLAGS_FFMPEGSOURCE) $(LDFLAGS_LIBAVFORMAT) $(LDFLAGS_LIBAVCODEC) $(LDFLAGS_LIBSWSCALE) $(LDFLAGS_LIBAVUTIL) $(LDFLAGS_LIBPOSTPROC)
 LDFLAGS_POST += $(LDFLAGS_FFMPEGSOURCE)
 endif
 ###########
 # SUBTITLES
 ###########
 ifeq (yes, $(WITH_LIBASS))
 SRC_OPT += subtitles_provider_libass.cpp
 subtitles_provider_libass.o: CXXFLAGS += $(CFLAGS_LIBASS)  $(CFLAGS_ICONV)
 LDFLAGS += $(LDFLAGS_LIBASS) $(LDFLAGS_ICONV) $(LDFLAGS_FONTCONFIG)
 LDFLAGS_POST += $(LDFLAGS_LIBASS)
 endif
 ############
 # AUTOMATION
 ############
 ifeq (yes, $(HAVE_AUTO4_LUA))
 SRC_OPT += auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp
 auto4_lua.o auto4_lua_assfile.o auto4_lua_dialog.o auto4_lua_scriptreader.o: CXXFLAGS += $(CFLAGS_LUA)
 LDFLAGS += $(LDFLAGS_LUA)
 endif
 ##############
 # MISCELLANOUS
 ##############
 ifeq (yes, $(HAVE_HUNSPELL))
 SRC_OPT += spellchecker_hunspell.cpp
 spellchecker_hunspell.o: CXXFLAGS += $(CFLAGS_HUNSPELL)
 LDFLAGS += $(LDFLAGS_HUNSPELL)
 endif
 #####################
 # SOURCE-LEVEL CFLAGS
 #####################
 audio_player.o:					CXXFLAGS += $(CFLAGS_ALSA) $(CFLAGS_PORTAUDIO) $(CFLAGS_LIBPULSE) $(CFLAGS_OPENAL)
 audio_provider.o:				CXXFLAGS += $(CFLAGS_FFMPEGSOURCE)
 auto4_base.o:					CXXFLAGS += $(CFLAGS_FREETYPE)
 charset_detect.o:				CXXFLAGS += -D_X86_
 font_file_lister_fontconfig.o:	CXXFLAGS += $(CFLAGS_FONTCONFIG) $(CFLAGS_FREETYPE)
 font_file_lister.o:				CXXFLAGS += $(CFLAGS_FREETYPE)
 text_file_reader.o:				CXXFLAGS += -D_X86_
 video_provider_manager.o:		CXXFLAGS += $(CFLAGS_FFMPEGSOURCE)
 # Ensure any optional source files above are added for compilation.
 SRC += $(SRC_OPT)
 SRC += \
 	MatroskaParser.c \
 	aegisublocale.cpp \
 	ass_attachment.cpp \
 	ass_dialogue.cpp \
 	ass_entry.cpp \
 	ass_export_filter.cpp \
 	ass_exporter.cpp \
 	ass_file.cpp \
 	ass_karaoke.cpp \
 	ass_override.cpp \
 	ass_style.cpp \
 	ass_style_storage.cpp \
 	ass_time.cpp \
 	audio_box.cpp \
 	audio_display.cpp \
 	audio_karaoke.cpp \
 	audio_player.cpp \
 	audio_provider.cpp \
 	audio_provider_convert.cpp \
 	audio_provider_downmix.cpp \
 	audio_provider_hd.cpp \
 	audio_provider_pcm.cpp \
 	audio_provider_ram.cpp \
 	audio_renderer.cpp \
 	audio_renderer_spectrum.cpp \
 	auto4_base.cpp \
 	avisynth_wrap.cpp \
 	base_grid.cpp \
 	browse_button.cpp \
 	charset_conv.cpp \
 	charset_detect.cpp \
 	colorspace.cpp \
 	colour_button.cpp \
 	compat.cpp \
 	dialog_about.cpp \
 	dialog_attachments.cpp \
 	dialog_automation.cpp \
 	dialog_colorpicker.cpp \
 	dialog_detached_video.cpp \
 	dialog_dummy_video.cpp \
 	dialog_export.cpp \
 	dialog_fonts_collector.cpp \
 	dialog_jumpto.cpp \
 	dialog_kara_timing_copy.cpp \
 	dialog_log.cpp \
 	dialog_paste_over.cpp \
 	dialog_progress.cpp \
 	dialog_properties.cpp \
 	dialog_resample.cpp \
 	dialog_search_replace.cpp \
 	dialog_selected_choices.cpp \
 	dialog_selection.cpp \
 	dialog_shift_times.cpp \
 	dialog_spellchecker.cpp \
 	dialog_style_editor.cpp \
 	dialog_style_manager.cpp \
 	dialog_styling_assistant.cpp \
 	dialog_text_import.cpp \
 	dialog_timing_processor.cpp \
 	dialog_translation.cpp \
 	dialog_version_check.cpp \
 	dialog_video_details.cpp \
 	drop.cpp \
 	audio_provider_dummy.cpp \
 	export_clean_info.cpp \
 	export_fixstyle.cpp \
 	export_framerate.cpp \
 	fft.cpp \
 	font_file_lister.cpp \
 	font_file_lister_fontconfig.cpp \
 	frame_main.cpp \
 	frame_main_events.cpp \
 	gl_text.cpp \
 	gl_wrap.cpp \
 	help_button.cpp \
 	hotkeys.cpp \
 	kana_table.cpp \
 	keyframe.cpp \
 	main.cpp \
 	md5.c \
 	mkv_wrap.cpp \
 	mythes.cxx \
 	plugin_manager.cpp \
 	preferences.cpp \
 	preferences_base.cpp \
 	scintilla_text_ctrl.cpp \
 	spellchecker.cpp \
 	spline.cpp \
 	spline_curve.cpp \
 	standard_paths.cpp \
 	static_bmp.cpp \
 	string_codec.cpp \
 	subs_edit_box.cpp \
 	subs_edit_ctrl.cpp \
 	subs_grid.cpp \
 	subs_preview.cpp \
 	subtitle_format.cpp \
 	subtitle_format_ass.cpp \
 	subtitle_format_dvd.cpp \
 	subtitle_format_encore.cpp \
 	subtitle_format_microdvd.cpp \
 	subtitle_format_mkv.cpp \
 	subtitle_format_srt.cpp \
 	subtitle_format_transtation.cpp \
 	subtitle_format_ttxt.cpp \
 	subtitle_format_txt.cpp \
 	subtitles_provider.cpp \
 	text_file_reader.cpp \
 	text_file_writer.cpp \
 	thesaurus.cpp \
 	thesaurus_myspell.cpp \
 	timeedit_ctrl.cpp \
 	threaded_frame_source.cpp \
 	toggle_bitmap.cpp \
 	tooltip_manager.cpp \
 	utils.cpp \
 	validators.cpp \
 	variable_data.cpp \
 	vector2d.cpp \
 	version.cpp \
 	video_box.cpp \
 	video_context.cpp \
 	video_display.cpp \
 	video_frame.cpp \
 	video_out_gl.cpp \
 	video_provider_cache.cpp \
 	video_provider_dummy.cpp \
 	video_provider_manager.cpp \
 	video_provider_yuv4mpeg.cpp \
 	video_slider.cpp \
 	visual_feature.cpp \
 	visual_tool.cpp \
 	visual_tool_clip.cpp \
 	visual_tool_cross.cpp \
 	visual_tool_drag.cpp \
 	visual_tool_rotatexy.cpp \
 	visual_tool_rotatez.cpp \
 	visual_tool_scale.cpp \
 	visual_tool_vector_clip.cpp
 HEADER += \
 	*.h \
 	include/aegisub/*.h \
    config/*.h
 EXTRA_DIST = \
 	$(SRC_OPT) \
 	*.hxx
 EXTRA_DIST= \
 	bitmaps/16/*.png \
 	bitmaps/24/*.png \
 	bitmaps/misc/*.png \
 	bitmaps/windows/eyedropper.cur \
 	bitmaps/windows/icon.ico
 include ../Makefile.target
--- a/aegisub/src/Makefile.am
+++ b/aegisub/src/Makefile.am
@ -1,314 +0,0 @@
 AUTOMAKE_OPTIONS = foreign
 SUFFIXES = .c .cpp .rc
 noinst_LIBRARIES= 
 AM_CXXFLAGS = 
 DISTCLEANFILES =
 if PRECOMPILED_HEADER
 BUILT_SOURCES = agi_pre.h.gch
 precompiled_header = agi_pre.h
 AM_CXXFLAGS += -Winvalid-pch -fpch-deps -fpch-preprocess -include agi_pre.h
 nodist_aegisub_3_0_SOURCES = agi_pre.h.gch
 DISTCLEANFILES += agi_pre.h.gch
 endif
 SUBDIRS = \
 	bitmaps \
 	libresrc
 AM_CXXFLAGS += -DAEGISUB -D__STDC_FORMAT_MACROS -Iinclude -I../libffms/include -I../libaegisub/include @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@
 bin_PROGRAMS = aegisub-3.0
 aegisub_3_0_LDADD = libresrc/libresrc.a -L../libaegisub -laegisub-3.0
 aegisub_3_0_CPPFLAGS = @FREETYPE_CFLAGS@
 aegisub_3_0_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @CCMALLOC_LDFLAGS@ @EFENCE_LDFLAGS@
 LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ @CCMALLOC_LIBS@
 if PRECOMPILED_HEADER
 # This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
 agi_pre.h.gch: agi_pre.h
 	@CXX@ -include ../acconf.h $(DEFAULT_INCLUDES) @CXXFLAGS@ $(AM_CXXFLAGS) @DEBUG_FLAGS@ @PROFILE_FLAGS@ agi_pre.h
 endif
 if BUILD_DARWIN
 aegisub_3_0_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
 endif
 noinst_LIBRARIES += libaudio_player.a
 libaudio_player_a_SOURCES = audio_player.cpp
 libaudio_player_a_CPPFLAGS = @ALSA_CFLAGS@ @PORTAUDIO_CFLAGS@ @LIBPULSE_CFLAGS@ @OPENAL_CFLAGS@
 aegisub_3_0_LDADD += libaudio_player.a
 if HAVE_ALSA
 noinst_LIBRARIES += libaudio_alsa.a
 libaudio_alsa_a_SOURCES = audio_player_alsa.cpp
 aegisub_3_0_LDFLAGS += @ALSA_LDFLAGS@
 aegisub_3_0_LDADD += libaudio_alsa.a
 endif
 if HAVE_PORTAUDIO
 noinst_LIBRARIES += libaudio_portaudio.a
 libaudio_portaudio_a_SOURCES = audio_player_portaudio.cpp
 libaudio_portaudio_a_CPPFLAGS = @PORTAUDIO_CFLAGS@
 aegisub_3_0_LDFLAGS += @PORTAUDIO_LIBS@
 aegisub_3_0_LDADD += libaudio_portaudio.a
 endif
 if HAVE_PULSEAUDIO
 noinst_LIBRARIES += libaudio_pulseaudio.a
 libaudio_pulseaudio_a_SOURCES = audio_player_pulse.cpp
 libaudio_pulseaudio_a_CPPFLAGS = @LIBPULSE_CFLAGS@
 aegisub_3_0_LDFLAGS += @LIBPULSE_LIBS@
 aegisub_3_0_LDADD += libaudio_pulseaudio.a
 endif
 if HAVE_OPENAL
 noinst_LIBRARIES += libaudio_openal.a
 libaudio_openal_a_SOURCES = audio_player_openal.cpp
 libaudio_openal_a_CPPFLAGS = @OPENAL_CFLAGS@
 aegisub_3_0_LDFLAGS += @OPENAL_LIBS@
 aegisub_3_0_LDADD += libaudio_openal.a
 endif
 if HAVE_OSS
 noinst_LIBRARIES += libaudio_oss.a
 libaudio_oss_a_SOURCES = audio_player_oss.cpp
 aegisub_3_0_LDADD += libaudio_oss.a
 endif
 if HAVE_FFMPEG
 aegisub_3_0_LDFLAGS += @LIBAVFORMAT_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ @LIBAVUTIL_LIBS@
 endif
 if HAVE_PROVIDER_FFMPEGSOURCE
 noinst_LIBRARIES += libaudiovideo_ffmpegsource.a
 libaudiovideo_ffmpegsource_a_SOURCES = audio_provider_ffmpegsource.cpp video_provider_ffmpegsource.cpp ffmpegsource_common.cpp
 libaudiovideo_ffmpegsource_a_CPPFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
 aegisub_3_0_LDADD += libaudiovideo_ffmpegsource.a ../libffms/libffmpegsource_aegisub.a
 aegisub_3_0_LDFLAGS += @LIBPOSTPROC_LIBS@
 endif
 noinst_LIBRARIES += libsubtitle_provider.a
 libsubtitle_provider_a_SOURCES = subtitles_provider.cpp
 libsubtitle_provider_a_CPPFLAGS = @CSRI_CFLAGS@
 aegisub_3_0_LDADD += libsubtitle_provider.a
 if WITH_LIBASS
 noinst_LIBRARIES += libsubtitle_ass.a
 libsubtitle_ass_a_SOURCES = subtitles_provider_libass.cpp
 libsubtitle_ass_a_CPPFLAGS = @LIBASS_CFLAGS@ @ICONV_CFLAGS@
 LIBS += @LIBASS_LIBS@
 aegisub_3_0_LDADD += libsubtitle_ass.a
 aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@
 endif
 if WITH_CSRI
 noinst_LIBRARIES += libsubtitle_csri.a
 libsubtitle_csri_a_SOURCES = subtitles_provider_csri.cpp
 libsubtitle_csri_a_CPPFLAGS = @ICONV_CFLAGS@ @CSRI_CFLAGS@
 LIBS += @CSRI_LIBS@
 aegisub_3_0_LDADD += libsubtitle_csri.a
 aegisub_3_0_LDFLAGS += @FONTCONFIG_LIBS@
 endif
 if HAVE_AUTO4_LUA
 noinst_LIBRARIES += libauto4_lua.a
 libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp
 libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@
 LIBS += @LUA_LDFLAGS@
 aegisub_3_0_LDADD += libauto4_lua.a
 endif
 if HAVE_HUNSPELL
 noinst_LIBRARIES += libmisc_hunspell.a
 libmisc_hunspell_a_SOURCES = spellchecker_hunspell.cpp
 aegisub_3_0_LDFLAGS += @HUNSPELL_LIBS@
 aegisub_3_0_LDADD += libmisc_hunspell.a
 endif
 if FONTLISTER_FREETYPE
  FONT_LISTER = font_file_lister_freetype.cpp
 endif
 if FONTLISTER_FONTCONFIG
  FONT_LISTER = font_file_lister_fontconfig.cpp
 endif
 noinst_LIBRARIES += libmisc_universalchardet.a
 libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp
 libmisc_universalchardet_a_CPPFLAGS = -D_X86_
 aegisub_3_0_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
 ## These aren't built, but are listed here so 'make dist' can always find all the sources
 ## This should also list all Win32 specific files
 EXTRA_aegisub_3_0_SOURCES = \
 	$(precompiled_header) \
 	font_file_lister.cpp \
 	$(FONT_LISTER) \
 	audio_player_dsound.cpp \
 	audio_player_dsound2.cpp \
 	audio_player_portaudio.cpp \
 	audio_player_pulse.cpp \
 	audio_player_oss.cpp \
 	audio_provider_avs.cpp \
 	auto4_lua.cpp \
 	auto4_lua_assfile.cpp \
 	auto4_lua_dialog.cpp \
 	auto4_lua_scriptreader.cpp \
 	avisynth_wrap.cpp \
 	setup.cpp \
 	spellchecker_hunspell.cpp \
 	subtitles_provider_csri.cpp \
 	subtitles_provider_libass.cpp \
 	video_provider_avs.cpp
 aegisub_3_0_SOURCES = \
 	$(FFMPEG) \
 	$(HUNSPELL) \
 	$(LIBASS) \
 	font_file_lister.cpp \
 	$(FONT_LISTER) \
 	MatroskaParser.c \
 	aegisublocale.cpp \
 	ass_attachment.cpp \
 	ass_dialogue.cpp \
 	ass_entry.cpp \
 	ass_export_filter.cpp \
 	ass_exporter.cpp \
 	ass_file.cpp \
 	ass_karaoke.cpp \
 	ass_override.cpp \
 	ass_style.cpp \
 	ass_style_storage.cpp \
 	ass_time.cpp \
 	audio_box.cpp \
 	audio_display.cpp \
 	audio_karaoke.cpp \
 	audio_provider.cpp \
 	audio_provider_convert.cpp \
 	audio_provider_downmix.cpp \
 	audio_provider_hd.cpp \
 	audio_provider_pcm.cpp \
 	audio_provider_ram.cpp \
 	audio_renderer.cpp \
 	audio_renderer_spectrum.cpp \
 	auto4_base.cpp \
 	avisynth_wrap.cpp \
 	base_grid.cpp \
 	browse_button.cpp \
 	charset_conv.cpp \
 	colorspace.cpp \
 	colour_button.cpp \
 	compat.cpp \
 	dialog_about.cpp \
 	dialog_attachments.cpp \
 	dialog_automation.cpp \
 	dialog_colorpicker.cpp \
 	dialog_detached_video.cpp \
 	dialog_dummy_video.cpp \
 	dialog_export.cpp \
 	dialog_fonts_collector.cpp \
 	dialog_jumpto.cpp \
 	dialog_kara_timing_copy.cpp \
 	dialog_log.cpp \
 	dialog_paste_over.cpp \
 	dialog_progress.cpp \
 	dialog_properties.cpp \
 	dialog_resample.cpp \
 	dialog_search_replace.cpp \
 	dialog_selected_choices.cpp \
 	dialog_selection.cpp \
 	dialog_shift_times.cpp \
 	dialog_spellchecker.cpp \
 	dialog_style_editor.cpp \
 	dialog_style_manager.cpp \
 	dialog_styling_assistant.cpp \
 	dialog_text_import.cpp \
 	dialog_timing_processor.cpp \
 	dialog_translation.cpp \
 	dialog_version_check.cpp \
 	dialog_video_details.cpp \
 	drop.cpp \
 	audio_provider_dummy.cpp \
 	export_clean_info.cpp \
 	export_fixstyle.cpp \
 	export_framerate.cpp \
 	fft.cpp \
 	frame_main.cpp \
 	frame_main_events.cpp \
 	gl_text.cpp \
 	gl_wrap.cpp \
 	help_button.cpp \
 	hotkeys.cpp \
 	kana_table.cpp \
 	keyframe.cpp \
 	main.cpp \
 	md5.c \
 	mkv_wrap.cpp \
 	mythes.cxx \
 	plugin_manager.cpp \
 	preferences.cpp \
 	preferences_base.cpp \
 	scintilla_text_ctrl.cpp \
 	spellchecker.cpp \
 	spline.cpp \
 	spline_curve.cpp \
 	standard_paths.cpp \
 	static_bmp.cpp \
 	string_codec.cpp \
 	subs_edit_box.cpp \
 	subs_edit_ctrl.cpp \
 	subs_grid.cpp \
 	subs_preview.cpp \
 	subtitle_format.cpp \
 	subtitle_format_ass.cpp \
 	subtitle_format_dvd.cpp \
 	subtitle_format_encore.cpp \
 	subtitle_format_microdvd.cpp \
 	subtitle_format_mkv.cpp \
 	subtitle_format_srt.cpp \
 	subtitle_format_transtation.cpp \
 	subtitle_format_ttxt.cpp \
 	subtitle_format_txt.cpp \
 	text_file_writer.cpp \
 	thesaurus.cpp \
 	thesaurus_myspell.cpp \
 	timeedit_ctrl.cpp \
 	threaded_frame_source.cpp \
 	toggle_bitmap.cpp \
 	tooltip_manager.cpp \
 	utils.cpp \
 	validators.cpp \
 	variable_data.cpp \
 	vector2d.cpp \
 	version.cpp \
 	video_box.cpp \
 	video_context.cpp \
 	video_display.cpp \
 	video_frame.cpp \
 	video_out_gl.cpp \
 	video_provider_cache.cpp \
 	video_provider_dummy.cpp \
 	video_provider_manager.cpp \
 	video_provider_yuv4mpeg.cpp \
 	video_slider.cpp \
 	visual_feature.cpp \
 	visual_tool.cpp \
 	visual_tool_clip.cpp \
 	visual_tool_cross.cpp \
 	visual_tool_drag.cpp \
 	visual_tool_rotatexy.cpp \
 	visual_tool_rotatez.cpp \
 	visual_tool_scale.cpp \
 	visual_tool_vector_clip.cpp
 aegisub_3_0_SOURCES += \
 	$(srcdir)/*.h \
 	$(srcdir)/include/aegisub/*.h \
    $(srcdir)/config/*.h
 noinst_HEADERS = \
 	gl/glext.h \
 	$(srcdir)/*.hxx
--- a/aegisub/src/bitmaps/Makefile.am
+++ b/aegisub/src/bitmaps/Makefile.am
@ -1,6 +0,0 @@
 EXTRA_DIST= \
 	16/*.png \
 	24/*.png \
 	misc/*.png \
 	windows/eyedropper.cur \
 	windows/icon.ico
--- a/aegisub/src/libresrc/Makefile.am
+++ b/aegisub/src/libresrc/Makefile.am
@ -1,10 +1,18 @@
-noinst_LIBRARIES = libresrc.a
+include ../../Makefile.inc
-libresrc_a_SOURCES = libresrc.cpp libresrc.h
+LIB = libresrc.a
 nodist_libresrc_a_SOURCES = bitmap.cpp bitmap.h default_config.cpp default_config.h
 libresrc_a_CPPFLAGS = @WX_CPPFLAGS@
-BUILT_SOURCES = bitmap.cpp default_config.cpp
+CPPFLAGS = $(CPPFLAGS_WX)
 SRC = \
 	bitmap.cpp \
 	default_config.cpp \
 	libresrc.cpp
 HEADER= \
 	libresrc.h
 all: bitmap.cpp default_config.cpp
 bitmap.cpp: ../../tools/common-respack
 	../../tools/common-respack bitmap.cpp ../bitmaps/16 ../bitmaps/24 ../bitmaps/misc/splash.png ../bitmaps/misc/wxicon.png
@ -23,3 +31,5 @@ CLEANFILES= \
 	bitmap.h \
 	default_config.cpp \
 	default_config.h
 include ../../Makefile.target
--- a/aegisub/tests/Makefile
+++ b/aegisub/tests/Makefile
@ -0,0 +1,31 @@
 # $Id$
 include ../Makefile.inc
 PROGRAM = run
 LDFLAGS		+= -L../libaegisub -laegisub-3.0 -rpath $(CURDIR)/../libaegisub -lgtest -L../universalchardet -luniversalchardet
 LDFLAGS		+= $(LDFLAGS_ICONV)
 CPPFLAGS	+= -I../src/include -I../libaegisub/include $(CFLAGS_ICONV)
 ifdef $(BUILD_DARWIN)
 LDFLAGS += -framework ApplicationServices
 endif
 SRC = \
 		main.cpp \
 		util.cpp \
 		util_unix.cpp \
 		libaegisub_access.cpp \
 		libaegisub_cajun.cpp \
 		libaegisub_iconv.cpp \
 		libaegisub_line_iterator.cpp \
 		libaegisub_mru.cpp \
 		libaegisub_util.cpp \
 		libaegisub_vfr.cpp
 HEADER = \
 	*.h
 include ../Makefile.target
--- a/aegisub/tests/Makefile.am
+++ b/aegisub/tests/Makefile.am
@ -1,25 +0,0 @@
 # $Id$
 bin_PROGRAMS = run
 run_LDFLAGS= -L../libaegisub -laegisub-3.0 -lgtest @ICONV_LDFLAGS@ -L../universalchardet -luniversalchardet
 run_CPPFLAGS= -I../src/include -I../libaegisub/include
 if BUILD_DARWIN
 run_LDFLAGS += -framework ApplicationServices
 endif
 run_SOURCES = \
 		main.cpp \
 		util.cpp \
 		util_unix.cpp \
 		libaegisub_access.cpp \
 		libaegisub_cajun.cpp \
 		libaegisub_iconv.cpp \
 		libaegisub_line_iterator.cpp \
 		libaegisub_mru.cpp \
 		libaegisub_util.cpp \
 		libaegisub_vfr.cpp
 run_SOURCES += \
 	*.h
--- a/aegisub/tools/Makefile
+++ b/aegisub/tools/Makefile
@ -0,0 +1,24 @@
 include ../Makefile.inc
 PROGRAM = common-respack
 SRC			+= common-respack.cpp
 CPPFLAGS	+= $(CPPFLAGS_WX)
 LDFLAGS		+= $(LDFLAGS_WX)
 ifdef $(BUILD_DARWIN)
 bin_PROGRAMS += osx-bundle-restart-helper
 osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c
 endif
 EXTRA_DIST = \
 	osx-bundle-restart-helper.c \
 	osx-bundle.sh \
 	osx-dmg.sh \
 	osx-fix-libs.py
 CLEANFILES= \
 	osx-bundle.sed
 include ../Makefile.target
--- a/aegisub/tools/Makefile.am
+++ b/aegisub/tools/Makefile.am
@ -1,15 +0,0 @@
 bin_PROGRAMS = common-respack
 common_respack_CPPFLAGS = @WX_CPPFLAGS@
 common_respack_LDFLAGS = @WX_LIBS@
 common_respack_SOURCES = common-respack.cpp
 if BUILD_DARWIN
 bin_PROGRAMS += osx-bundle-restart-helper
 osx_bundle_restart_helper_SOURCES = osx-bundle-restart-helper.c
 endif
 EXTRA_DIST = \
 	osx-bundle-restart-helper.c \
 	osx-bundle.sh \
 	osx-dmg.sh \
 	osx-fix-libs.py
--- a/aegisub/universalchardet/Makefile.am
+++ b/aegisub/universalchardet/Makefile.am
@ -1,8 +1,10 @@
-noinst_LIBRARIES = libuniversalchardet.a
+include ../Makefile.inc
-AM_CPPFLAGS = -D_X86_
+LIB = libuniversalchardet.a
-libuniversalchardet_a_SOURCES = \
+CXXFLAGS += -D_X86_
 SRC = \
 	CharDistribution.cpp \
 	JpCntx.cpp \
 	LangBulgarianModel.cpp \
@ -29,33 +31,7 @@ libuniversalchardet_a_SOURCES = \
 	nsUTF8Prober.cpp \
 	nsUniversalDetector.cpp
-libuniversalchardet_a_SOURCES += \
+HEADER = *.h
 	CharDistribution.h \
 	JpCntx.h \
 	nsBig5Prober.h \
 	nsCharSetProber.h \
 	nsCodingStateMachine.h \
 	nsEUCJPProber.h \
 	nsEUCKRProber.h \
 	nsEUCTWProber.h \
 	nsError.h \
 	nsEscCharsetProber.h \
 	nsGB2312Prober.h \
 	nsHebrewProber.h \
 	nsLatin1Prober.h \
 	nsMBCSGroupProber.h \
 	nsPkgInt.h \
 	nsSBCSGroupProber.h \
 	nsSBCharSetProber.h \
 	nsSJISProber.h \
 	nsUTF8Prober.h \
 	nsUniversalDetector.h \
 	nscore.h \
 	prcpucfg.h \
 	prmem.h \
 	protypes.h \
 	prtypes.h \
 	xpcom-config.h
 EXTRA_DIST = \
 	Big5Freq.tab \
@ -63,3 +39,5 @@ EXTRA_DIST = \
 	EUCTWFreq.tab \
 	GB2312Freq.tab \
 	JISFreq.tab
 include ../Makefile.target