From 5fd30aa8f3ac1e36271e9c71d596d126b208fb7f Mon Sep 17 00:00:00 2001
From: Pavel Labath <pavelo@centrum.sk>
Date: Thu, 19 May 2011 10:19:23 +0200
Subject: Integrate the lua build system into ours

---
 Makefile.am          | 2 +-
 configure.in         | 3 +++
 libs/Makefile.am     | 7 +++++++
 src/FbTk/Makefile.am | 1 +
 src/Makefile.am      | 3 ++-
 util/Makefile.am     | 2 +-
 6 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 libs/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 136824f..b7e961d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 # data dir after util so that utils are built for path searching
 # when generating menu
 
-SUBDIRS = doc nls src util data
+SUBDIRS = doc nls libs src util data
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 ACLOCAL_AMFLAGS = -I .
 EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
diff --git a/configure.in b/configure.in
index 1d69f34..ce0d268 100644
--- a/configure.in
+++ b/configure.in
@@ -723,11 +723,14 @@ dnl AM_MAINTAINER_MODE
 dnl Output files
 AM_CONFIG_HEADER(config.h)
 
+AC_CONFIG_COMMANDS([libs/lua/src/Makefile], [cp $srcdir/libs/lua/src/Makefile libs/lua/src/Makefile])
+
 AC_OUTPUT(Makefile
 version.h
 src/Makefile
 src/FbTk/Makefile
 src/tests/Makefile
+libs/Makefile
 util/Makefile
 util/fbrun/Makefile
 data/Makefile
diff --git a/libs/Makefile.am b/libs/Makefile.am
new file mode 100644
index 0000000..7ee9d94
--- /dev/null
+++ b/libs/Makefile.am
@@ -0,0 +1,7 @@
+# lib/Makefile.am for Fluxbox - an X11 Window manager
+
+all-local:
+	$(MAKE) -C lua/src VPATH="../../$(srcdir)/lua/src" CC=$(CXX) CFLAGS='$(CXXFLAGS) $$(MYCFLAGS)' linux
+
+clean-local:
+	$(MAKE) -C lua/src clean
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 4c38f84..264e114 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LIBRARIES = libFbTk.a
 
 AM_CPPFLAGS=@CPPFLAGS@
+INCLUDES = -I$(top_srcdir)/libs/lua/src
 
 if XFT
 xft_SOURCE= XftFontImp.hh XftFontImp.cc
diff --git a/src/Makefile.am b/src/Makefile.am
index cfb249a..72b5930 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ PROGRAM_PREFIX=@program_prefix@
 PROGRAM_SUFFIX=@program_suffix@
 
 AM_CPPFLAGS=
+INCLUDES = -I$(top_srcdir)/libs/lua/src
 
 bin_PROGRAMS= fluxbox
 BUILT_SOURCES = defaults.hh defaults.cc
@@ -162,4 +163,4 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
 	${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
 
 
-LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
+LDADD=FbTk/libFbTk.a ../libs/lua/src/liblua.a FbTk/LogicCommands.o defaults.$(OBJEXT)
diff --git a/util/Makefile.am b/util/Makefile.am
index d0895ae..d8b83e3 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -8,7 +8,7 @@ fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
 			../src/FbTk/libFbTk.a
 fluxbox_update_configs_SOURCES=	fluxbox-update_configs.cc
 fluxbox_update_configs_LDADD=	../src/defaults.o ../src/Resources.o \
-			../src/FbTk/libFbTk.a
+			../src/FbTk/libFbTk.a ../libs/lua/src/liblua.a
 fluxbox_remote_SOURCES=	fluxbox-remote.cc
 
 MAINTAINERCLEANFILES=	Makefile.in
-- 
cgit v0.11.2