Also partly reorganized interface management
This commit is contained in:
parent
2dfc94c623
commit
d84fe9d791
2
Makefile
2
Makefile
|
@ -23,6 +23,7 @@ dist:
|
||||||
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
|
@$(TAR) $(PACKAGE)-$(VERSION).tar.gz -- \
|
||||||
$(PACKAGE)-$(VERSION)/data/Makefile \
|
$(PACKAGE)-$(VERSION)/data/Makefile \
|
||||||
$(PACKAGE)-$(VERSION)/data/GServer.interface \
|
$(PACKAGE)-$(VERSION)/data/GServer.interface \
|
||||||
|
$(PACKAGE)-$(VERSION)/data/appbroker.sh \
|
||||||
$(PACKAGE)-$(VERSION)/data/project.conf \
|
$(PACKAGE)-$(VERSION)/data/project.conf \
|
||||||
$(PACKAGE)-$(VERSION)/include/GServer.h \
|
$(PACKAGE)-$(VERSION)/include/GServer.h \
|
||||||
$(PACKAGE)-$(VERSION)/include/Makefile \
|
$(PACKAGE)-$(VERSION)/include/Makefile \
|
||||||
|
@ -34,7 +35,6 @@ dist:
|
||||||
$(PACKAGE)-$(VERSION)/src/gserver.c \
|
$(PACKAGE)-$(VERSION)/src/gserver.c \
|
||||||
$(PACKAGE)-$(VERSION)/src/main.c \
|
$(PACKAGE)-$(VERSION)/src/main.c \
|
||||||
$(PACKAGE)-$(VERSION)/src/Makefile \
|
$(PACKAGE)-$(VERSION)/src/Makefile \
|
||||||
$(PACKAGE)-$(VERSION)/src/appbroker.sh \
|
|
||||||
$(PACKAGE)-$(VERSION)/src/gserver.h \
|
$(PACKAGE)-$(VERSION)/src/gserver.h \
|
||||||
$(PACKAGE)-$(VERSION)/src/project.conf \
|
$(PACKAGE)-$(VERSION)/src/project.conf \
|
||||||
$(PACKAGE)-$(VERSION)/src/video/glut.c \
|
$(PACKAGE)-$(VERSION)/src/video/glut.c \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#$Id$
|
#$Id$
|
||||||
#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
|
#Copyright (c) 2011-2013 Pierre Pronchery <khorben@defora.org>
|
||||||
#All rights reserved.
|
#All rights reserved.
|
||||||
#
|
#
|
||||||
#Redistribution and use in source and binary forms, with or without
|
#Redistribution and use in source and binary forms, with or without
|
||||||
|
@ -52,5 +52,7 @@ if [ $# -ne 1 ]; then
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
fi
|
||||||
|
|
||||||
APPINTERFACE="${1%%.h}.interface"
|
APPINTERFACE="$1"
|
||||||
|
APPINTERFACE="${APPINTERFACE##*/}"
|
||||||
|
APPINTERFACE="../data/${APPINTERFACE%%.h}.interface"
|
||||||
AppBroker -o "$1" "$APPINTERFACE"
|
AppBroker -o "$1" "$APPINTERFACE"
|
|
@ -1,4 +1,4 @@
|
||||||
dist=Makefile,GServer.interface
|
dist=Makefile,GServer.interface,appbroker.sh
|
||||||
|
|
||||||
[GServer.interface]
|
[GServer.interface]
|
||||||
install=$(PREFIX)/etc/AppInterface
|
install=$(PREFIX)/etc/AppInterface
|
||||||
|
|
|
@ -3,6 +3,7 @@ TARGETS = ../data/GServer.h GServer
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
DESTDIR =
|
DESTDIR =
|
||||||
BINDIR = $(PREFIX)/bin
|
BINDIR = $(PREFIX)/bin
|
||||||
|
SBINDIR = $(PREFIX)/sbin
|
||||||
CC ?= cc
|
CC ?= cc
|
||||||
CPPFLAGSF= -I ../include
|
CPPFLAGSF= -I ../include
|
||||||
CPPFLAGS= -I $(PREFIX)/include
|
CPPFLAGS= -I $(PREFIX)/include
|
||||||
|
@ -22,7 +23,7 @@ subdirs:
|
||||||
@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
|
@for i in $(SUBDIRS); do (cd $$i && $(MAKE)) || exit; done
|
||||||
|
|
||||||
../data/GServer.h: ../data/GServer.interface
|
../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_OBJS = gserver.o main.o
|
||||||
GServer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gl`
|
GServer_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags gl`
|
||||||
|
|
|
@ -6,11 +6,11 @@ cflags_force=-W `pkg-config --cflags libApp`
|
||||||
cflags=-Wall -g -O2 -pedantic
|
cflags=-Wall -g -O2 -pedantic
|
||||||
ldflags_force=`pkg-config --libs libApp` -Wl,--export-dynamic
|
ldflags_force=`pkg-config --libs libApp` -Wl,--export-dynamic
|
||||||
ldflags=
|
ldflags=
|
||||||
dist=Makefile,appbroker.sh,gserver.h
|
dist=Makefile,gserver.h
|
||||||
|
|
||||||
[../data/GServer.h]
|
[../data/GServer.h]
|
||||||
type=script
|
type=script
|
||||||
script=./appbroker.sh
|
script=../data/appbroker.sh
|
||||||
depends=../data/GServer.interface
|
depends=../data/GServer.interface
|
||||||
|
|
||||||
[GServer]
|
[GServer]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user