From 7fa1d046c64192336cb99288e3c6e105e8e866bc Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Wed, 4 Mar 2015 01:53:48 +0100 Subject: [PATCH] Partial build fix for libApp --- tests/Makefile | 4 ++-- tests/project.conf | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index ab7cc08..6021393 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -20,7 +20,7 @@ INSTALL = install all: $(TARGETS) $(OBJDIR)Dummy.h: ../data/Dummy.interface ../tools/appbroker.sh - ../tools/appbroker.sh -P "$(PREFIX)" -- "$(OBJDIR)Dummy.h" + ../tools/appbroker.sh -O APPBROKER=../tools/AppBroker -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) - ../tools/appbroker.sh -c -P "$(PREFIX)" -- "Dummy.h" + ../tools/appbroker.sh -O APPBROKER=../tools/AppBroker -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 17179c7..e8e0511 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -8,7 +8,8 @@ dist=Makefile,tests.sh [Dummy.h] type=script -script=../tools/appbroker.sh +#FIXME breaks when OBJDIR is set +script=../tools/appbroker.sh -O APPBROKER=../tools/AppBroker depends=../data/Dummy.interface,../tools/appbroker.sh [appclient]