aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-05-19 08:19:23 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:52:45 (GMT)
commit650ccad88ed769132b9a260464fe66b2d31eaab6 (patch)
treeadc90211238090c8645cff5777462270b638d114 /src
parent3c1d7bb1c521e824dfa46903fd4014722d0f5a29 (diff)
downloadfluxbox_pavel-650ccad88ed769132b9a260464fe66b2d31eaab6.zip
fluxbox_pavel-650ccad88ed769132b9a260464fe66b2d31eaab6.tar.bz2
Integrate the lua build system into ours
Diffstat (limited to 'src')
-rw-r--r--src/FbTk/Makefile.am1
-rw-r--r--src/Makefile.am3
2 files changed, 3 insertions, 1 deletions
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 @@
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)