all repos — fluxbox @ f2c58a0348c4b3feb1b664ee51b7cd14f0632b28

custom fork of the fluxbox windowmanager 

update
fluxgen fluxgen
commit

f2c58a0348c4b3feb1b664ee51b7cd14f0632b28

parent

44f0695af5832e9e6b74c7df3b1fda93e7608f28

4 files changed, 37 insertions(+), 19 deletions(-)

jump to
M data/.cvsignore → data/.cvsignore 
@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 init
 menu
+startup
M util/.cvsignore → util/.cvsignore 
@@ -3,3 +3,4 @@ .libs
 Makefile
 Makefile.in
 bsetroot
+startfluxbox
M util/Makefile.am → 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
 
-bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
+clean-local:
+		rm -f startfluxbox
 
+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
M util/fbrun/Makefile.am → 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