From a301c16d0ff661a592332f5b7f2524705ef6faed Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 10 Aug 2014 01:44:12 +0200
Subject: [PATCH] Build libBrowser first

---
 Makefile         |  2 +-
 project.conf     |  2 +-
 src/Makefile     | 15 +++------------
 src/project.conf |  1 -
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 35a1deb..fa3881e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE	= Browser
 VERSION	= 0.4.13
-SUBDIRS	= data doc include po src tests tools
+SUBDIRS	= data doc include po src src/plugins tests tools
 RM	= rm -f
 LN	= ln -f
 TAR	= tar -czvf
diff --git a/project.conf b/project.conf
index bbf8138..7e36419 100644
--- a/project.conf
+++ b/project.conf
@@ -2,5 +2,5 @@ package=Browser
 version=0.4.13
 config=h,sh
 
-subdirs=data,doc,include,po,src,tests,tools
+subdirs=data,doc,include,po,src,src/plugins,tests,tools
 dist=Makefile,COPYING,TODO,config.h,config.sh
diff --git a/src/Makefile b/src/Makefile
index bf2dc82..7798eca 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,3 @@
-SUBDIRS	= plugins
 TARGETS	= libBrowser.a libBrowser.so.0.0 libBrowser.so.0 libBrowser.so browser copy delete desktop desktopctl move open properties view
 PREFIX	= /usr/local
 DESTDIR	=
@@ -20,10 +19,7 @@ MKDIR	= mkdir -m 0755 -p
 INSTALL	= install
 
 
-all: subdirs $(TARGETS)
-
-subdirs:
-	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE)) || exit; done
+all: $(TARGETS)
 
 libBrowser_OBJS = vfs.o
 libBrowser_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) -fPIC
@@ -141,16 +137,12 @@ view.o: view.c
 	$(CC) $(view_CFLAGS) -c view.c
 
 clean:
-	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) clean) || exit; done
 	$(RM) -- $(libBrowser_OBJS) $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(desktop_OBJS) $(desktopctl_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(view_OBJS)
 
-distclean:
-	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) distclean) || exit; done
-	$(RM) -- $(libBrowser_OBJS) $(browser_OBJS) $(copy_OBJS) $(delete_OBJS) $(desktop_OBJS) $(desktopctl_OBJS) $(move_OBJS) $(open_OBJS) $(properties_OBJS) $(view_OBJS)
+distclean: clean
 	$(RM) -- $(TARGETS)
 
 install: $(TARGETS)
-	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) install) || exit; done
 	$(MKDIR) $(DESTDIR)$(LIBDIR)
 	$(INSTALL) -m 0644 libBrowser.a $(DESTDIR)$(LIBDIR)/libBrowser.a
 	$(INSTALL) -m 0755 libBrowser.so.0.0 $(DESTDIR)$(LIBDIR)/libBrowser.so.0.0
@@ -176,7 +168,6 @@ install: $(TARGETS)
 	$(INSTALL) -m 0755 view $(DESTDIR)$(BINDIR)/view
 
 uninstall:
-	@for i in $(SUBDIRS); do (cd "$$i" && $(MAKE) uninstall) || exit; done
 	$(RM) -- $(DESTDIR)$(LIBDIR)/libBrowser.a
 	$(RM) -- $(DESTDIR)$(LIBDIR)/libBrowser.so.0.0
 	$(RM) -- $(DESTDIR)$(LIBDIR)/libBrowser.so.0
@@ -191,4 +182,4 @@ uninstall:
 	$(RM) -- $(DESTDIR)$(BINDIR)/properties
 	$(RM) -- $(DESTDIR)$(BINDIR)/view
 
-.PHONY: all subdirs clean distclean install uninstall
+.PHONY: all clean distclean install uninstall
diff --git a/src/project.conf b/src/project.conf
index bcdb09f..27f2022 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,4 +1,3 @@
-subdirs=plugins
 targets=libBrowser,browser,copy,delete,desktop,desktopctl,move,open,properties,view
 #cppflags=-D EMBEDDED
 cflags_force=-W `pkg-config --cflags libDesktop`