From 90e53e44106d316148f14f8cf55c16254b57b93c Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 4 Mar 2015 01:36:35 +0100
Subject: [PATCH] Moved appbroker.sh to the "tools" folder

---
 Makefile                     | 2 +-
 data/project.conf            | 2 +-
 tests/Makefile               | 4 ++--
 tests/project.conf           | 2 +-
 {data => tools}/appbroker.sh | 0
 tools/project.conf           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename {data => tools}/appbroker.sh (100%)

diff --git a/Makefile b/Makefile
index b5a16f3..0199e18 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,6 @@ dist:
 	@cd $(OBJDIR). && $(TAR) -czvf $(OBJDIR)$(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/data/Makefile \
 		$(PACKAGE)-$(VERSION)/data/Dummy.interface \
-		$(PACKAGE)-$(VERSION)/data/appbroker.sh \
 		$(PACKAGE)-$(VERSION)/data/libApp.pc.in \
 		$(PACKAGE)-$(VERSION)/data/pkgconfig.sh \
 		$(PACKAGE)-$(VERSION)/data/project.conf \
@@ -90,6 +89,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/tools/appbroker.c \
 		$(PACKAGE)-$(VERSION)/tools/appclient.c \
 		$(PACKAGE)-$(VERSION)/tools/Makefile \
+		$(PACKAGE)-$(VERSION)/tools/appbroker.sh \
 		$(PACKAGE)-$(VERSION)/tools/project.conf \
 		$(PACKAGE)-$(VERSION)/Makefile \
 		$(PACKAGE)-$(VERSION)/COPYING \
diff --git a/data/project.conf b/data/project.conf
index 3c03ef4..fd70f72 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,5 +1,5 @@
 targets=libApp.pc
-dist=Makefile,Dummy.interface,appbroker.sh,libApp.pc.in,pkgconfig.sh
+dist=Makefile,Dummy.interface,libApp.pc.in,pkgconfig.sh
 
 [Dummy.interface]
 install=$(PREFIX)/etc/AppInterface
diff --git a/tests/Makefile b/tests/Makefile
index 0b4c728..88ab806 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -20,7 +20,7 @@ INSTALL	= install
 all: $(TARGETS)
 
 $(OBJDIR)Dummy.h: ../data/Dummy.interface
-	../data/appbroker.sh -P "$(PREFIX)" -- "$(OBJDIR)Dummy.h"
+	../tools/appbroker.sh -P "$(PREFIX)" -- "$(OBJDIR)Dummy.h"
 
 appclient_OBJS = $(OBJDIR)appclient.o
 appclient_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS)
@@ -87,7 +87,7 @@ $(OBJDIR)transport.o: transport.c ../src/libApp.a
 
 clean:
 	$(RM) -- $(Dummy.h_OBJS) $(appclient_OBJS) $(appmessage_OBJS) $(appserver_OBJS) $(includes_OBJS) $(lookup_OBJS) $(tests.log_OBJS) $(transport_OBJS)
-	../data/appbroker.sh -c -P "$(PREFIX)" -- "Dummy.h"
+	../tools/appbroker.sh -c -P "$(PREFIX)" -- "Dummy.h"
 	./tests.sh -c -P "$(PREFIX)" -- "tests.log"
 
 distclean: clean
diff --git a/tests/project.conf b/tests/project.conf
index fab042e..9da38c2 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -8,7 +8,7 @@ dist=Makefile,tests.sh
 
 [Dummy.h]
 type=script
-script=../data/appbroker.sh
+script=../tools/appbroker.sh
 depends=../data/Dummy.interface
 
 [appclient]
diff --git a/data/appbroker.sh b/tools/appbroker.sh
similarity index 100%
rename from data/appbroker.sh
rename to tools/appbroker.sh
diff --git a/tools/project.conf b/tools/project.conf
index 53b36eb..ff9a382 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -5,7 +5,7 @@ cflags_force=-W `pkg-config --cflags libSystem`
 cflags=-Wall -g -O2 -pedantic
 ldflags_force=-L../src `pkg-config --libs libSystem` -lApp
 ldflags=-L$(PREFIX)/lib -Wl,-rpath,$(PREFIX)/lib
-dist=Makefile
+dist=Makefile,appbroker.sh
 
 [AppBroker]
 type=binary