diff options
| author | Pavel Labath <pavelo@centrum.sk> | 2011-05-19 08:19:23 (GMT) |
|---|---|---|
| committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:08:41 (GMT) |
| commit | 044ab57a04578a1c5d4a33eaf7c8a1fb8396c385 (patch) | |
| tree | 7cd9381ead72b18c72666f8465537fea591d8293 /src | |
| parent | 0fa62fe1598c5b04925c0b7b98d0d00d28d10d88 (diff) | |
| download | fluxbox_paul-044ab57a04578a1c5d4a33eaf7c8a1fb8396c385.zip fluxbox_paul-044ab57a04578a1c5d4a33eaf7c8a1fb8396c385.tar.bz2 | |
Integrate the lua build system into ours
Diffstat (limited to 'src')
| -rw-r--r-- | src/FbTk/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 3 insertions, 1 deletions
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 @@ | |||
| 1 | noinst_LIBRARIES = libFbTk.a | 1 | noinst_LIBRARIES = libFbTk.a |
| 2 | 2 | ||
| 3 | AM_CPPFLAGS=@CPPFLAGS@ | 3 | AM_CPPFLAGS=@CPPFLAGS@ |
| 4 | INCLUDES = -I$(top_srcdir)/libs/lua/src | ||
| 4 | 5 | ||
| 5 | if XFT | 6 | if XFT |
| 6 | xft_SOURCE= XftFontImp.hh XftFontImp.cc | 7 | xft_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@ | |||
| 39 | PROGRAM_SUFFIX=@program_suffix@ | 39 | PROGRAM_SUFFIX=@program_suffix@ |
| 40 | 40 | ||
| 41 | AM_CPPFLAGS= | 41 | AM_CPPFLAGS= |
| 42 | INCLUDES = -I$(top_srcdir)/libs/lua/src | ||
| 42 | 43 | ||
| 43 | bin_PROGRAMS= fluxbox | 44 | bin_PROGRAMS= fluxbox |
| 44 | BUILT_SOURCES = defaults.hh defaults.cc | 45 | BUILT_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 | ||
| 169 | LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) | 170 | LDADD=FbTk/libFbTk.a ../libs/lua/src/liblua.a FbTk/LogicCommands.o defaults.$(OBJEXT) |