aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/Makefile.am59
-rw-r--r--util/Makemodule.am58
-rw-r--r--util/fbrun/FbRun.cc4
-rw-r--r--util/fbrun/Makefile.am8
-rw-r--r--util/fbrun/Makemodule.am22
-rw-r--r--util/fbsetroot.cc4
-rw-r--r--util/fluxbox-update_configs.cc9
7 files changed, 80 insertions, 84 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
deleted file mode 100644
index f47924f..0000000
--- a/util/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
1# util/Makefile.am for Fluxbox
2SUBDIRS= fbrun
3AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= fbsetroot fluxbox-update_configs fluxbox-remote
6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh
7fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
8 ../src/FbTk/libFbTk.a
9fluxbox_update_configs_SOURCES= fluxbox-update_configs.cc
10fluxbox_update_configs_LDADD= ../src/defaults.o ../src/Resources.o \
11 ../src/FbTk/libFbTk.a
12fluxbox_remote_SOURCES= fluxbox-remote.cc
13
14MAINTAINERCLEANFILES= Makefile.in
15EXTRA_DIST= fbsetbg fluxbox-generate_menu.in \
16 startfluxbox.in
17
18PROGRAM_PREFIX=@program_prefix@
19PROGRAM_SUFFIX=@program_suffix@
20
21all-local: startfluxbox
22
23clean-local:
24 rm -f startfluxbox fluxbox-generate_menu
25
26fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
27 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
28
29fluxbox-update_configs.o: fluxbox-update_configs.cc ../config.h \
30 $(top_builddir)/src/defaults.hh
31
32fluxbox-remote.o: fluxbox-remote.cc
33
34startfluxbox: startfluxbox.in
35 @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
36 -e "s,@pkgbindir@,$(bindir),g" \
37 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
38 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
39 -e "s,@EXEEXT@,$(EXEEXT),g" \
40 $(srcdir)/startfluxbox.in > startfluxbox
41 -chmod 755 startfluxbox
42
43fluxbox-generate_menu: fluxbox-generate_menu.in
44 @regex_cmd@ -e "s,@PREFIX@,$(prefix),g" \
45 -e "s,@pkgprefix@,$(PROGRAM_PREFIX:NONE=),g" \
46 -e "s,@pkgsuffix@,$(PROGRAM_SUFFIX:NONE=),g" \
47 -e "s,@EXEEXT@,$(EXEEXT),g" \
48 $(srcdir)/fluxbox-generate_menu.in \
49 > fluxbox-generate_menu
50 -chmod 755 fluxbox-generate_menu
51
52../src/FbRootWindow.o:
53 cd ../src && ${MAKE} FbRootWindow.o
54../src/FbAtoms.o:
55 cd ../src && ${MAKE} FbAtoms.o
56../src/defaults.o:
57 cd ../src && ${MAKE} defaults.o
58../src/Resources.o:
59 cd ../src && ${MAKE} Resources.o
diff --git a/util/Makemodule.am b/util/Makemodule.am
new file mode 100644
index 0000000..44f3002
--- /dev/null
+++ b/util/Makemodule.am
@@ -0,0 +1,58 @@
1# util/Makefile.am for Fluxbox
2
3bin_SCRIPTS = \
4 util/fbsetbg \
5 util/fluxbox-generate_menu \
6 util/startfluxbox
7EXTRA_DIST += \
8 util/fbsetbg
9PATHFILES += \
10 util/startfluxbox \
11 util/fluxbox-generate_menu
12
13bin_PROGRAMS += \
14 fbsetroot \
15 fluxbox-remote \
16 fluxbox-update_configs
17
18fbsetroot_SOURCES = \
19 src/FbAtoms.cc \
20 src/FbRootWindow.cc \
21 util/fbsetroot.cc \
22 util/fbsetroot.hh
23fbsetroot_LDADD = \
24 libFbTk.a
25fbsetroot_CPPFLAGS = \
26 $(AM_CPPFLAGS) \
27 -I$(fbtk_incdir) \
28 -I$(src_incdir) \
29 -I$(nls_incdir)
30fbsetroot_LDFLAGS = \
31 $(FONTCONFIG_LIBS) \
32 $(FRIBIDI_LIBS) \
33 $(X11_LIBS) \
34 $(XFT_LIBS) \
35 $(XRENDER_LIBS)
36
37fluxbox_update_configs_SOURCES = \
38 src/defaults.cc \
39 src/Resources.cc \
40 util/fluxbox-update_configs.cc
41fluxbox_update_configs_CPPFLAGS = \
42 $(AM_CPPFLAGS) \
43 -I$(fbtk_incdir) \
44 -I$(src_incdir) \
45 -I$(nls_incdir)
46fluxbox_update_configs_LDADD = \
47 libFbTk.a
48fluxbox_update_configs_LDFLAGS = \
49 $(FRIBIDI_LIBS) \
50 $(X11_LIBS)
51
52fluxbox_remote_SOURCES = \
53 util/fluxbox-remote.cc
54fluxbox_remote_CPPFLAGS = \
55 $(AM_CPPFLAGS) \
56 -I$(fbtk_incdir)
57fluxbox_remote_LDFLAGS = \
58 $(X11_LIBS)
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 @@
27#include "FbTk/KeyUtil.hh" 27#include "FbTk/KeyUtil.hh"
28#include "FbTk/FileUtil.hh" 28#include "FbTk/FileUtil.hh"
29 29
30#ifdef HAVE_CONFIG_H
31#include "config.h"
32#endif // HAVE_CONFIG_H
33
34#ifdef HAVE_XPM 30#ifdef HAVE_XPM
35#include <X11/xpm.h> 31#include <X11/xpm.h>
36#include "fbrun.xpm" 32#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 @@
1FLUXBOX_SRC_DIR= ../../src/
2AM_CPPFLAGS= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
3bin_PROGRAMS= fbrun
4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
6
7${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
8 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 @@
1bin_PROGRAMS += fbrun
2
3fbrun_CPPFLAGS = \
4 $(AM_CPPFLAGS) \
5 -I$(src_incdir)
6
7fbrun_SOURCES = \
8 util/fbrun/FbRun.hh \
9 util/fbrun/FbRun.cc \
10 util/fbrun/main.cc \
11 util/fbrun/fbrun.xpm
12
13fbrun_LDADD = libFbTk.a
14
15fbrun_LDFLAGS = \
16 $(FONTCONFIG_LIBS) \
17 $(FRIBIDI_LIBS) \
18 $(X11_LIBS) \
19 $(XFT_LIBS) \
20 $(XINERAMA_LIBS) \
21 $(XPM_LIBS) \
22 $(XRENDER_LIBS)
diff --git a/util/fbsetroot.cc b/util/fbsetroot.cc
index 99139bb..3a2f2b9 100644
--- a/util/fbsetroot.cc
+++ b/util/fbsetroot.cc
@@ -26,10 +26,6 @@
26#include "../src/FbTk/GContext.hh" 26#include "../src/FbTk/GContext.hh"
27#include "../src/FbRootWindow.hh" 27#include "../src/FbRootWindow.hh"
28 28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif // HAVE_CONFIG_H
32
33#include <X11/Xatom.h> 29#include <X11/Xatom.h>
34 30
35#ifdef HAVE_CSTRING 31#ifdef HAVE_CSTRING
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 8eff8e4..164b073 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -26,19 +26,10 @@
26 26
27#include "../src/defaults.hh" 27#include "../src/defaults.hh"
28 28
29#ifdef HAVE_CONFIG_H
30#include "config.h"
31#endif // HAVE_CONFIG_H
32
33#ifdef HAVE_SIGNAL_H 29#ifdef HAVE_SIGNAL_H
34#include <signal.h> 30#include <signal.h>
35#endif // HAVE_SIGNAL_H 31#endif // HAVE_SIGNAL_H
36 32
37//use GNU extensions
38#ifndef _GNU_SOURCE
39#define _GNU_SOURCE
40#endif // _GNU_SOURCE
41
42#ifdef HAVE_CSTRING 33#ifdef HAVE_CSTRING
43 #include <cstring> 34 #include <cstring>
44#else 35#else
generated by cgit v0.11.2 at 2024-11-24 00:44:06 (GMT)