From 15697d0cf7bc2c5d6fb88602d8f994d4b243d369 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Mon, 8 Sep 2014 06:24:31 +0200 Subject: [PATCH] Updated the dependencies for the "hayes" test --- tests/Makefile | 8 ++++---- tests/project.conf | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 882280b..57509ee 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -21,7 +21,7 @@ hayes_OBJS = hayes.o hayes_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags glib-2.0 libSystem` hayes_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs glib-2.0 libSystem` -hayes: $(hayes_OBJS) ../src/modems/hayes.c +hayes: $(hayes_OBJS) $(CC) -o hayes $(hayes_OBJS) $(hayes_LDFLAGS) modems_OBJS = modems.o @@ -55,19 +55,19 @@ ussd: $(ussd_OBJS) tests.log: hayes modems pdu plugins tests.sh ussd ./tests.sh -P "$(PREFIX)" -- "tests.log" -hayes.o: hayes.c +hayes.o: hayes.c ../src/modems/hayes.o $(CC) $(hayes_CFLAGS) -c hayes.c modems.o: modems.c $(CC) $(modems_CFLAGS) -c modems.c -pdu.o: pdu.c ../src/modems/hayes.c ../src/modems/hayes/command.c ../src/modems/hayes/command.h +pdu.o: pdu.c ../src/modems/hayes.o $(CC) -I ../src/modems $(pdu_CFLAGS) -c pdu.c plugins.o: plugins.c $(CC) $(plugins_CFLAGS) -c plugins.c -ussd.o: ussd.c ../src/modems/hayes.c ../src/modems/hayes/command.c ../src/modems/hayes/command.h +ussd.o: ussd.c ../src/modems/hayes.o $(CC) -I ../src/modems $(ussd_CFLAGS) -c ussd.c clean: diff --git a/tests/project.conf b/tests/project.conf index c64cbc6..d460a67 100644 --- a/tests/project.conf +++ b/tests/project.conf @@ -10,7 +10,9 @@ type=binary cflags=`pkg-config --cflags glib-2.0 libSystem` ldflags=`pkg-config --libs glib-2.0 libSystem` sources=hayes.c -depends=../src/modems/hayes.c + +[hayes.c] +depends=../src/modems/hayes.o [modems] type=binary @@ -26,7 +28,7 @@ sources=pdu.c [pdu.c] cppflags=-I ../src/modems -depends=../src/modems/hayes.c,../src/modems/hayes/command.c,../src/modems/hayes/command.h +depends=../src/modems/hayes.o [plugins] type=binary @@ -47,4 +49,4 @@ sources=ussd.c [ussd.c] cppflags=-I ../src/modems -depends=../src/modems/hayes.c,../src/modems/hayes/command.c,../src/modems/hayes/command.h +depends=../src/modems/hayes.o