aboutsummaryrefslogtreecommitdiff
path: root/util/Makefile.am
diff options
context:
space:
mode:
authormathias <mathias>2005-07-12 04:56:05 (GMT)
committermathias <mathias>2005-07-12 04:56:05 (GMT)
commit1fe9ef3056e80dfed05bbb1b00443c11a64223c1 (patch)
tree3fbae0cada70fe79e939d6c32c7dcb2786b6a816 /util/Makefile.am
parent9531144097b7fdae1051933fd2aa89c8928b72b2 (diff)
downloadfluxbox-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.zip
fluxbox-1fe9ef3056e80dfed05bbb1b00443c11a64223c1.tar.bz2
Renaming of 'bsetroot' to 'fbsetroot' (Mathias)
blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax nowadays and collide when you install fluxbox and blackbox. hence the renaming.
Diffstat (limited to 'util/Makefile.am')
-rw-r--r--util/Makefile.am8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/Makefile.am b/util/Makefile.am
index 3e45aa6..58a232f 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,9 +2,9 @@
2SUBDIRS= fbrun 2SUBDIRS= fbrun
3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk 3INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox 4bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox
5bin_PROGRAMS= bsetroot 5bin_PROGRAMS= fbsetroot
6bsetroot_SOURCES= bsetroot.cc bsetroot.hh 6fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh
7bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \ 7fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
8 ../src/FbTk/libFbTk.a 8 ../src/FbTk/libFbTk.a
9 9
10MAINTAINERCLEANFILES= Makefile.in 10MAINTAINERCLEANFILES= Makefile.in
@@ -16,7 +16,7 @@ all-local: startfluxbox
16clean-local: 16clean-local:
17 rm -f startfluxbox fluxbox-generate_menu 17 rm -f startfluxbox fluxbox-generate_menu
18 18
19bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \ 19fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
20 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh 20 $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
21 21
22startfluxbox: startfluxbox.in 22startfluxbox: startfluxbox.in