diff options
author | fluxgen <fluxgen> | 2003-09-07 19:14:10 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-09-07 19:14:10 (GMT) |
commit | f2c58a0348c4b3feb1b664ee51b7cd14f0632b28 (patch) | |
tree | 1978ef57f3dd549e4ec30c70463fc3766aac132f /util | |
parent | 44f0695af5832e9e6b74c7df3b1fda93e7608f28 (diff) | |
download | fluxbox-f2c58a0348c4b3feb1b664ee51b7cd14f0632b28.zip fluxbox-f2c58a0348c4b3feb1b664ee51b7cd14f0632b28.tar.bz2 |
update
Diffstat (limited to 'util')
-rw-r--r-- | util/.cvsignore | 1 | ||||
-rw-r--r-- | util/Makefile.am | 40 | ||||
-rw-r--r-- | util/fbrun/Makefile.am | 14 |
3 files changed, 36 insertions, 19 deletions
diff --git a/util/.cvsignore b/util/.cvsignore index 1dd67ed..11cb841 100644 --- a/util/.cvsignore +++ b/util/.cvsignore | |||
@@ -3,3 +3,4 @@ | |||
3 | Makefile | 3 | Makefile |
4 | Makefile.in | 4 | Makefile.in |
5 | bsetroot | 5 | bsetroot |
6 | startfluxbox | ||
diff --git a/util/Makefile.am b/util/Makefile.am index 63820c6..2637c1e 100644 --- a/util/Makefile.am +++ b/util/Makefile.am | |||
@@ -1,17 +1,33 @@ | |||
1 | # util/Makefile.am for Fluxbox | 1 | # util/Makefile.am for Fluxbox |
2 | SUBDIRS = fbrun | 2 | SUBDIRS= fbrun |
3 | INCLUDES=-I../src/FbTk/ | 3 | INCLUDES= -I../src/FbTk/ |
4 | bin_SCRIPTS = fbsetbg fluxbox-generate_menu | 4 | bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox |
5 | bin_PROGRAMS = bsetroot | 5 | bin_PROGRAMS= bsetroot |
6 | bsetroot_SOURCES = bsetroot.cc bsetroot.hh | 6 | bsetroot_SOURCES= bsetroot.cc bsetroot.hh |
7 | bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \ | 7 | bsetroot_LDADD= ../src/FbRootWindow.o ../src/I18n.o \ |
8 | ../src/FbTk/libFbTk.a | 8 | ../src/FbAtoms.o ../src/FbTk/libFbTk.a |
9 | 9 | ||
10 | MAINTAINERCLEANFILES = Makefile.in | 10 | MAINTAINERCLEANFILES= Makefile.in |
11 | EXTRA_DIST=fbsetbg fluxbox-generate_menu | 11 | EXTRA_DIST= fbsetbg fluxbox-generate_menu startfluxbox |
12 | |||
13 | all-local: startfluxbox | ||
12 | 14 | ||
13 | distclean-local: | 15 | distclean-local: |
14 | rm -f *\~ Makefile.in | 16 | rm -f *\~ Makefile.in |
17 | |||
18 | clean-local: | ||
19 | rm -f startfluxbox | ||
20 | |||
21 | bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh | ||
15 | 22 | ||
16 | bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh | 23 | startfluxbox: startfluxbox.in |
24 | @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \ | ||
25 | -e "s,@pkgbindir@,$(bindir),g" \ | ||
26 | startfluxbox.in > startfluxbox | ||
17 | 27 | ||
28 | ../src/FbRootWindow.o: | ||
29 | cd ../src && make FbRootWindow.o | ||
30 | ../src/I18n.o: | ||
31 | cd ../src && make I18n.o | ||
32 | ../src/FbAtoms.o: | ||
33 | cd ../src && make FbAtoms.o | ||
diff --git a/util/fbrun/Makefile.am b/util/fbrun/Makefile.am index fda7e83..6f4752a 100644 --- a/util/fbrun/Makefile.am +++ b/util/fbrun/Makefile.am | |||
@@ -1,8 +1,8 @@ | |||
1 | FLUXBOX_SRC_DIR=../../src/ | 1 | FLUXBOX_SRC_DIR= ../../src/ |
2 | INCLUDES = -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk | 2 | INCLUDES= -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk |
3 | bin_PROGRAMS = fbrun | 3 | bin_PROGRAMS= fbrun |
4 | fbrun_SOURCES = FbRun.hh FbRun.cc main.cc fbrun.xpm | 4 | fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm |
5 | 5 | fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | |
6 | fbrun_LDADD = ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a | ||
7 | |||
8 | 6 | ||
7 | ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a: | ||
8 | cd ${FLUXBOX_SRC_DIR}FbTk && make \ No newline at end of file | ||