diff options
| author | Pavel Labath <pavelo@centrum.sk> | 2011-05-19 08:19:23 (GMT) |
|---|---|---|
| committer | Pavel Labath <pavelo@centrum.sk> | 2011-06-15 15:34:27 (GMT) |
| commit | 5fd30aa8f3ac1e36271e9c71d596d126b208fb7f (patch) | |
| tree | 2f07134997aa268390a3cf2f24810344a9bf33fe /src/Makefile.am | |
| parent | d4c5d99bcbf614e31e4f724319437e82d7f2a208 (diff) | |
| download | fluxbox_pavel-5fd30aa8f3ac1e36271e9c71d596d126b208fb7f.zip fluxbox_pavel-5fd30aa8f3ac1e36271e9c71d596d126b208fb7f.tar.bz2 | |
Integrate the lua build system into ours
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
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@ | |||
| 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 |
| @@ -162,4 +163,4 @@ fluxbox_SOURCES = AtomHandler.hh ArrowButton.hh ArrowButton.cc \ | |||
| 162 | ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} | 163 | ${REMEMBER_SOURCE} ${TOOLBAR_SOURCE} |
| 163 | 164 | ||
| 164 | 165 | ||
| 165 | LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) | 166 | LDADD=FbTk/libFbTk.a ../libs/lua/src/liblua.a FbTk/LogicCommands.o defaults.$(OBJEXT) |