aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-19 08:19:23 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:08:41 (GMT)
commit044ab57a04578a1c5d4a33eaf7c8a1fb8396c385 (patch)
tree7cd9381ead72b18c72666f8465537fea591d8293
parent0fa62fe1598c5b04925c0b7b98d0d00d28d10d88 (diff)
downloadfluxbox_paul-044ab57a04578a1c5d4a33eaf7c8a1fb8396c385.zip
fluxbox_paul-044ab57a04578a1c5d4a33eaf7c8a1fb8396c385.tar.bz2
Integrate the lua build system into ours
-rw-r--r--Makefile.am2
-rw-r--r--configure.in3
-rw-r--r--libs/Makefile.am7
-rw-r--r--src/FbTk/Makefile.am1
-rw-r--r--src/Makefile.am3
-rw-r--r--util/Makefile.am2
6 files changed, 15 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 136824f..b7e961d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
3# data dir after util so that utils are built for path searching 3# data dir after util so that utils are built for path searching
4# when generating menu 4# when generating menu
5 5
6SUBDIRS = doc nls src util data 6SUBDIRS = doc nls libs src util data
7MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in 7MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
8ACLOCAL_AMFLAGS = -I . 8ACLOCAL_AMFLAGS = -I .
9EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/* 9EXTRA_DIST = acinclude.m4 $(top_srcdir)/3rd/vim/* $(top_srcdir)/3rd/vim/syntax/*
diff --git a/configure.in b/configure.in
index 14f1993..c54833b 100644
--- a/configure.in
+++ b/configure.in
@@ -707,11 +707,14 @@ dnl AM_MAINTAINER_MODE
707dnl Output files 707dnl Output files
708AM_CONFIG_HEADER(config.h) 708AM_CONFIG_HEADER(config.h)
709 709
710AC_CONFIG_COMMANDS([libs/lua/src/Makefile], [cp $srcdir/libs/lua/src/Makefile libs/lua/src/Makefile])
711
710AC_OUTPUT(Makefile 712AC_OUTPUT(Makefile
711version.h 713version.h
712src/Makefile 714src/Makefile
713src/FbTk/Makefile 715src/FbTk/Makefile
714src/tests/Makefile 716src/tests/Makefile
717libs/Makefile
715util/Makefile 718util/Makefile
716util/fbrun/Makefile 719util/fbrun/Makefile
717data/Makefile 720data/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 @@
1# lib/Makefile.am for Fluxbox - an X11 Window manager
2
3all-local:
4 $(MAKE) -C lua/src VPATH="../../$(srcdir)/lua/src" CC=$(CXX) CFLAGS='$(CXXFLAGS) $$(MYCFLAGS)' linux
5
6clean-local:
7 $(MAKE) -C lua/src clean
diff --git a/src/FbTk/Makefile.am b/src/FbTk/Makefile.am
index 171f27d..a14d788 100644
--- a/src/FbTk/Makefile.am
+++ b/src/FbTk/Makefile.am
@@ -1,6 +1,7 @@
1noinst_LIBRARIES = libFbTk.a 1noinst_LIBRARIES = libFbTk.a
2 2
3AM_CPPFLAGS=@CPPFLAGS@ 3AM_CPPFLAGS=@CPPFLAGS@
4INCLUDES = -I$(top_srcdir)/libs/lua/src
4 5
5if XFT 6if XFT
6xft_SOURCE= XftFontImp.hh XftFontImp.cc 7xft_SOURCE= XftFontImp.hh XftFontImp.cc
diff --git a/src/Makefile.am b/src/Makefile.am
index 9a84897..c84f4cc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,6 +39,7 @@ PROGRAM_PREFIX=@program_prefix@
39PROGRAM_SUFFIX=@program_suffix@ 39PROGRAM_SUFFIX=@program_suffix@
40 40
41AM_CPPFLAGS= 41AM_CPPFLAGS=
42INCLUDES = -I$(top_srcdir)/libs/lua/src
42 43
43bin_PROGRAMS= fluxbox 44bin_PROGRAMS= fluxbox
44BUILT_SOURCES = defaults.hh defaults.cc 45BUILT_SOURCES = defaults.hh defaults.cc
@@ -166,4 +167,4 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \
166 ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} 167 ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
167 168
168 169
169LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) 170LDADD=FbTk/libFbTk.a ../libs/lua/src/liblua.a FbTk/LogicCommands.o defaults.$(OBJEXT)
diff --git a/util/Makefile.am b/util/Makefile.am
index e33dd30..306a080 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -8,7 +8,7 @@ fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
8 ../src/FbTk/libFbTk.a 8 ../src/FbTk/libFbTk.a
9fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc 9fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc
10fluxbox_update_configs_LDADD= ../src/defaults.o ../src/Resources.o \ 10fluxbox_update_configs_LDADD= ../src/defaults.o ../src/Resources.o \
11 ../src/FbTk/libFbTk.a 11 ../src/FbTk/libFbTk.a ../libs/lua/src/liblua.a
12fluxbox_remote_SOURCES= fluxbox-remote.cc 12fluxbox_remote_SOURCES= fluxbox-remote.cc
13 13
14MAINTAINERCLEANFILES= Makefile.in 14MAINTAINERCLEANFILES= Makefile.in