aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-09-07 19:14:10 (GMT)
committerfluxgen <fluxgen>2003-09-07 19:14:10 (GMT)
commitf2c58a0348c4b3feb1b664ee51b7cd14f0632b28 (patch)
tree1978ef57f3dd549e4ec30c70463fc3766aac132f
parent44f0695af5832e9e6b74c7df3b1fda93e7608f28 (diff)
downloadfluxbox_paul-f2c58a0348c4b3feb1b664ee51b7cd14f0632b28.zip
fluxbox_paul-f2c58a0348c4b3feb1b664ee51b7cd14f0632b28.tar.bz2
update
-rw-r--r--data/.cvsignore1
-rw-r--r--util/.cvsignore1
-rw-r--r--util/Makefile.am40
-rw-r--r--util/fbrun/Makefile.am14
4 files changed, 37 insertions, 19 deletions
diff --git a/data/.cvsignore b/data/.cvsignore
index 0547cc1..3c4de6b 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -2,3 +2,4 @@ Makefile
2Makefile.in 2Makefile.in
3init 3init
4menu 4menu
5startup
diff --git a/util/.cvsignore b/util/.cvsignore
index 1dd67ed..11cb841 100644
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -3,3 +3,4 @@
3Makefile 3Makefile
4Makefile.in 4Makefile.in
5bsetroot 5bsetroot
6startfluxbox
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
2SUBDIRS = fbrun 2SUBDIRS= fbrun
3INCLUDES=-I../src/FbTk/ 3INCLUDES= -I../src/FbTk/
4bin_SCRIPTS = fbsetbg fluxbox-generate_menu 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS = bsetroot 5bin_PROGRAMS= bsetroot
6bsetroot_SOURCES = bsetroot.cc bsetroot.hh 6bsetroot_SOURCES= bsetroot.cc bsetroot.hh
7bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \ 7bsetroot_LDADD= ../src/FbRootWindow.o ../src/I18n.o \
8 ../src/FbTk/libFbTk.a 8 ../src/FbAtoms.o ../src/FbTk/libFbTk.a
9 9
10MAINTAINERCLEANFILES = Makefile.in 10MAINTAINERCLEANFILES= Makefile.in
11EXTRA_DIST=fbsetbg fluxbox-generate_menu 11EXTRA_DIST= fbsetbg fluxbox-generate_menu startfluxbox
12
13all-local: startfluxbox
12 14
13distclean-local: 15distclean-local:
14 rm -f *\~ Makefile.in 16 rm -f *\~ Makefile.in
17
18clean-local:
19 rm -f startfluxbox
20
21bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
15 22
16bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh 23startfluxbox: 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 @@
1FLUXBOX_SRC_DIR=../../src/ 1FLUXBOX_SRC_DIR= ../../src/
2INCLUDES = -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk 2INCLUDES= -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}FbTk
3bin_PROGRAMS = fbrun 3bin_PROGRAMS= fbrun
4fbrun_SOURCES = FbRun.hh FbRun.cc main.cc fbrun.xpm 4fbrun_SOURCES= FbRun.hh FbRun.cc main.cc fbrun.xpm
5 5fbrun_LDADD= ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
6fbrun_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