From a9180cfcf7e9cfc0b09f5d4afd71a6a427d30997 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Mon, 9 Mar 2009 05:48:13 +0000 Subject: [PATCH] Missed patch: Fix build for auto3 it moved from ./auto3 -> src/libauto3. Originally committed to SVN as r2760. --- aegisub/Makefile.am | 5 ----- aegisub/configure.in | 2 +- aegisub/src/Makefile.am | 10 +++++++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index 41e2337db..2a7619ca9 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -5,10 +5,6 @@ if HAVE_UNIVCHARDET univchardet = universalchardet endif -if HAVE_AUTO3_LUA -auto3 = auto3 -endif - if WITH_LIBASS libass = libass endif @@ -19,7 +15,6 @@ endif SUBDIRS = \ $(univchardet) \ - $(auto3) \ $(libass) \ $(ffmpegsource) \ src \ diff --git a/aegisub/configure.in b/aegisub/configure.in index 6696c2cb0..3111aae57 100644 --- a/aegisub/configure.in +++ b/aegisub/configure.in @@ -1260,10 +1260,10 @@ Makefile src/Makefile src/bitmaps/Makefile src/libresrc/Makefile +src/libauto3/Makefile src/libosxutil/Makefile universalchardet/Makefile FFmpegSource2/Makefile -auto3/Makefile libass/Makefile automation/Makefile po/Makefile.in diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am index 5e80dd3a6..df25fc3b7 100644 --- a/aegisub/src/Makefile.am +++ b/aegisub/src/Makefile.am @@ -8,7 +8,15 @@ libosxutil_lib = libosxutil/libosxutil.a libosxutil_ldflags = -framework CoreFoundation endif -SUBDIRS = bitmaps libresrc $(libosxutil_subdir) +if HAVE_AUTO3_LUA +libauto3 = libauto3 +endif + +SUBDIRS = \ + bitmaps \ + libresrc \ + $(libauto3) \ + $(libosxutil_subdir) AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@