aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 1d69f34..ce0d268 100644
--- a/configure.in
+++ b/configure.in
@@ -723,11 +723,14 @@ dnl AM_MAINTAINER_MODE
723dnl Output files 723dnl Output files
724AM_CONFIG_HEADER(config.h) 724AM_CONFIG_HEADER(config.h)
725 725
726AC_CONFIG_COMMANDS([libs/lua/src/Makefile], [cp $srcdir/libs/lua/src/Makefile libs/lua/src/Makefile])
727
726AC_OUTPUT(Makefile 728AC_OUTPUT(Makefile
727version.h 729version.h
728src/Makefile 730src/Makefile
729src/FbTk/Makefile 731src/FbTk/Makefile
730src/tests/Makefile 732src/tests/Makefile
733libs/Makefile
731util/Makefile 734util/Makefile
732util/fbrun/Makefile 735util/fbrun/Makefile
733data/Makefile 736data/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 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 cfb249a..72b5930 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
@@ -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
165LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT) 166LDADD=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 \
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