merge Sami Kerola's new build-system

3 files changed, 22 insertions, 12 deletions

diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index fac09b9..66a5fec 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -27,10 +27,6 @@
 #include "FbTk/KeyUtil.hh"
 #include "FbTk/FileUtil.hh"
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif // HAVE_CONFIG_H
-
 #ifdef HAVE_XPM
 #include <X11/xpm.h>
 #include "fbrun.xpm"
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am
deleted file mode 100644
index 35317df..0000000
--- a/util/fbrun/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-FLUXBOX_SRC_DIR=        ../../src/
-AM_CPPFLAGS=            -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
-bin_PROGRAMS=           fbrun
-fbrun_SOURCES=          FbRun.hh FbRun.cc main.cc fbrun.xpm
-fbrun_LDADD=            ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
-
-${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
-        cd ${FLUXBOX_SRC_DIR}FbTk && make
diff --git a/util/fbrun/Makemodule.am b/util/fbrun/Makemodule.am
new file mode 100644
index 0000000..f730ac8
--- /dev/null
+++ b/util/fbrun/Makemodule.am
@@ -0,0 +1,22 @@
+bin_PROGRAMS += fbrun
+
+fbrun_CPPFLAGS = \
+        $(AM_CPPFLAGS) \
+        -I$(src_incdir)
+
+fbrun_SOURCES = \
+        util/fbrun/FbRun.hh \
+        util/fbrun/FbRun.cc \
+        util/fbrun/main.cc \
+        util/fbrun/fbrun.xpm
+
+fbrun_LDADD = libFbTk.a
+
+fbrun_LDFLAGS = \
+        $(FONTCONFIG_LIBS) \
+        $(FRIBIDI_LIBS) \
+        $(X11_LIBS) \
+        $(XFT_LIBS) \
+        $(XINERAMA_LIBS) \
+        $(XPM_LIBS) \
+        $(XRENDER_LIBS)