From f2c58a0348c4b3feb1b664ee51b7cd14f0632b28 Mon Sep 17 00:00:00 2001
From: fluxgen <fluxgen>
Date: Sun, 7 Sep 2003 19:14:10 +0000
Subject: update

---
 data/.cvsignore        |  1 +
 util/.cvsignore        |  1 +
 util/Makefile.am       | 40 ++++++++++++++++++++++++++++------------
 util/fbrun/Makefile.am | 14 +++++++-------
 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
 Makefile.in
 init
 menu
+startup
diff --git a/util/.cvsignore b/util/.cvsignore
index 1dd67ed..11cb841 100644
--- a/util/.cvsignore
+++ b/util/.cvsignore
@@ -3,3 +3,4 @@
 Makefile
 Makefile.in
 bsetroot
+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 @@
-# util/Makefile.am for Fluxbox 
-SUBDIRS = fbrun
-INCLUDES=-I../src/FbTk/
-bin_SCRIPTS = fbsetbg fluxbox-generate_menu
-bin_PROGRAMS =		bsetroot
-bsetroot_SOURCES =	bsetroot.cc bsetroot.hh
-bsetroot_LDADD =	../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \
-	../src/FbTk/libFbTk.a
+# util/Makefile.am for Fluxbox
+SUBDIRS=		fbrun
+INCLUDES= 		-I../src/FbTk/
+bin_SCRIPTS= 		fbsetbg fluxbox-generate_menu startfluxbox
+bin_PROGRAMS=		bsetroot
+bsetroot_SOURCES=	bsetroot.cc bsetroot.hh
+bsetroot_LDADD=		../src/FbRootWindow.o ../src/I18n.o \
+			../src/FbAtoms.o ../src/FbTk/libFbTk.a
 
-MAINTAINERCLEANFILES =	Makefile.in
-EXTRA_DIST=fbsetbg fluxbox-generate_menu
+MAINTAINERCLEANFILES=	Makefile.in
+EXTRA_DIST=		fbsetbg fluxbox-generate_menu startfluxbox
+
+all-local:	startfluxbox
 
 distclean-local:
-	rm -f *\~ Makefile.in
+		rm -f *\~ Makefile.in
+
+clean-local:
+		rm -f startfluxbox
+
+bsetroot.o: 	bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
 
-bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
+startfluxbox: 	startfluxbox.in
+		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
+		            -e "s,@pkgbindir@,$(bindir),g" \
+				startfluxbox.in > startfluxbox
 
+../src/FbRootWindow.o:
+	cd ../src && make FbRootWindow.o
+../src/I18n.o:
+	cd ../src && make I18n.o
+../src/FbAtoms.o:
+	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 @@
-FLUXBOX_SRC_DIR=../../src/
-INCLUDES = -I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}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=	../../src/
+INCLUDES= 		-I${FLUXBOX_SRC_DIR} -I${FLUXBOX_SRC_DIR}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
\ No newline at end of file
-- 
cgit v0.11.2