[sawfish/sawfish-2.90] Makefile/libexec update

[Christopher Bratusek <chrisb src gnome org>]

commit 3453df68875e42933114a6f48d46347fa2646453
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Sun Oct 24 19:14:05 2010 +0200

    Makefile/libexec update

 lisp/Makefile.in |    2 +-
 src/Makefile.in  |   17 +++++++++++------
 src/fake-libexec |    2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index d303239..b03aade 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -47,7 +47,7 @@ INSTALL_DIRS := \
 	sawfish/wm/animation sawfish/wm/theming \
 	sawfish/wm/state sawfish/wm/util \
 	sawfish/wm/commands sawfish/wm/session \
-	sawfish/wm/tabs
+	sawfish/wm/tabs sawfish/wm/edge
 
 all : lisp
 	set -e; for d in $(SUBDIRS); do \
diff --git a/src/Makefile.in b/src/Makefile.in
index 04dfdd2..42f1c4b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,17 +31,21 @@ SRCS :=	colors.c cursors.c display.c events.c fonts.c frames.c \
 	property-cache.c server.c session.c stacking-list.c windows.c
 OBJS := $(SRCS:.c=.o)
 
-DL_SRCS := gradient.c flippers.c x.c selection.c
+DL_SRCS := gradient.c x.c selection.c
 DL_OBJS := $(DL_SRCS:%.c=%.la) client.la
-DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/flippers.la \
-	  sawfish/wm/util/x.la sawfish/wm/util/selection.la
+DL_DSTS = sawfish/wm/util/gradient.la sawfish/wm/util/x.la sawfish/wm/util/selection.la
 DL_DIRS = sawfish/wm/util
 
+FLIPPER_DL_SRC := flippers.c
+FLIPPER_DL_OBJS := flippers.la
+FLIPPER_DL_DSTS = sawfish/wm/edge/flippers.la
+FLIPPER_DL_DIRS = sawfish/wm/edge
+
 INSTALL_HDRS = sawfish.h sawfish_subrs.h libclient.h server.h keys.h build.h
 
 override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(PANGO_CFLAGS) 
 
-all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style
+all : sawfish libclient.o $(DL_OBJS) $(FLIPPER_DL_OBJS) .libexec gtk-style
 
 sawfish : $(OBJS) $(LIBOBJS)
 	$(rep_LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(LDFLAGS) \
@@ -65,7 +69,7 @@ install : all installdirs
 	  $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)${bindir}; \
 	done
 	$(rep_DL_INSTALL) gtk-style $(DESTDIR)${sawfishexecdir}
-	$(foreach x,$(DL_DSTS),\
+	$(foreach x,$(DL_DSTS) $(FLIPPER_DL_DSTS),\
 	  $(rep_LIBTOOL) --mode=install $(INSTALL_PROGRAM) \
 	  $(notdir $(x)) $(DESTDIR)$(sawfishexecdir)/$(dir $(x));)
 	$(rep_INSTALL_ALIASES) -c $(srcdir) $(DESTDIR)$(sawfishexecdir)
@@ -90,9 +94,10 @@ uninstall :
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(bindir) $(DESTDIR)$(repexecdir)/sawfish \
 	  $(foreach x,$(DL_DIRS),$(DESTDIR)$(sawfishexecdir)/$(x)) \
+	  $(DESTDIR)$(sawfishexecdir)/$(FLIPPER_DL_DIRS) \
 	  $(DESTDIR)$(includedir)/sawfish/
 
-.libexec : $(DL_OBJS)
+.libexec : $(DL_OBJS) $(FLIPPER_DL_OBJS)
 	$(SHELL) $(srcdir)/fake-libexec
 
 clean :
diff --git a/src/fake-libexec b/src/fake-libexec
index 59f1cf6..14bad23 100755
--- a/src/fake-libexec
+++ b/src/fake-libexec
@@ -7,7 +7,7 @@ libexecdir="./.libexec"
 
 libs="\
  sawfish.client\
- sawfish.wm.util.flippers\
+ sawfish.wm.edge.flippers\
  sawfish.wm.util.gradient\
  sawfish.wm.util.play-sample\
  sawfish.wm.util.selection\