Also partly reorganized interface management

Makefile

@@ -23,6 +23,7 @@ dist:
 	@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
 		$(PACKAGE)-$(VERSION)/data/Makefile \
 		$(PACKAGE)-$(VERSION)/data/GServer.interface \
+		$(PACKAGE)-$(VERSION)/data/appbroker.sh \
 		$(PACKAGE)-$(VERSION)/data/project.conf \
 		$(PACKAGE)-$(VERSION)/include/GServer.h \
 		$(PACKAGE)-$(VERSION)/include/Makefile \
@@ -34,7 +35,6 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/gserver.c \
 		$(PACKAGE)-$(VERSION)/src/main.c \
 		$(PACKAGE)-$(VERSION)/src/Makefile \
-		$(PACKAGE)-$(VERSION)/src/appbroker.sh \
 		$(PACKAGE)-$(VERSION)/src/gserver.h \
 		$(PACKAGE)-$(VERSION)/src/project.conf \
 		$(PACKAGE)-$(VERSION)/src/video/glut.c \

data/appbroker.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2011-2013 Pierre Pronchery <khorben@defora.org>
 #All rights reserved.
 #
 #Redistribution and use in source and binary forms, with or without
@@ -52,5 +52,7 @@ if [ $# -ne 1 ]; then
 	exit $?
 fi
 
-APPINTERFACE="${1%%.h}.interface"
+APPINTERFACE="$1"
+APPINTERFACE="${APPINTERFACE##*/}"
+APPINTERFACE="../data/${APPINTERFACE%%.h}.interface"
 AppBroker -o "$1" "$APPINTERFACE"

data/project.conf

@@ -1,4 +1,4 @@
-dist=Makefile,GServer.interface
+dist=Makefile,GServer.interface,appbroker.sh
 
 [GServer.interface]
 install=$(PREFIX)/etc/AppInterface

src/Makefile

@@ -3,6 +3,7 @@ TARGETS	= ../data/GServer.h GServer
 PREFIX	= /usr/local
 DESTDIR	=
 BINDIR	= $(PREFIX)/bin
+SBINDIR	= $(PREFIX)/sbin
 CC	?= cc
 CPPFLAGSF= -I ../include
 CPPFLAGS= -I $(PREFIX)/include
@@ -22,7 +23,7 @@ subdirs:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
 
 ../data/GServer.h: ../data/GServer.interface
-	./appbroker.sh -P "$(PREFIX)" -- "../data/GServer.h"
+	../data/appbroker.sh -P "$(PREFIX)" -- "../data/GServer.h"
 
 GServer_OBJS = gserver.o main.o
 GServer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gl`

src/project.conf

@@ -6,11 +6,11 @@ cflags_force=-W `pkg-config --cflags libApp`
 cflags=-Wall -g -O2 -pedantic
 ldflags_force=`pkg-config --libs libApp` -Wl,--export-dynamic
 ldflags=
-dist=Makefile,appbroker.sh,gserver.h
+dist=Makefile,gserver.h
 
 [../data/GServer.h]
 type=script
-script=./appbroker.sh
+script=../data/appbroker.sh
 depends=../data/GServer.interface
 
 [GServer]