This patch replaces explicitly named output targets with the make
variable $@ as well as an instance where dbus_common.h was being added
to the compile command line due to the use of $^ rather than $<.

Signed-off-by: Steve Beattie <[email protected]>
---
 tests/regression/apparmor/Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: b/tests/regression/apparmor/Makefile
===================================================================
--- a/tests/regression/apparmor/Makefile
+++ b/tests/regression/apparmor/Makefile
@@ -152,16 +152,16 @@ changehat_pthread: changehat_pthread.c c
        ${CC} ${CFLAGS} ${LDFLAGS} $< -o $@ ${LDLIBS} -pthread
 
 dbus_common.o: dbus_common.c dbus_common.h
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -c ${LDLIBS} $(shell pkg-config --cflags 
--libs dbus-1)
+       ${CC} ${CFLAGS} ${LDFLAGS} $< -c ${LDLIBS} $(shell pkg-config --cflags 
--libs dbus-1)
 
 dbus_eavesdrop: dbus_eavesdrop.c dbus_common.o
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o dbus_eavesdrop ${LDLIBS} $(shell 
pkg-config --cflags --libs dbus-1)
+       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS} $(shell pkg-config 
--cflags --libs dbus-1)
 
 dbus_message: dbus_message.c dbus_common.o
-       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o dbus_message ${LDLIBS} $(shell 
pkg-config --cflags --libs dbus-1)
+       ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@ ${LDLIBS} $(shell pkg-config 
--cflags --libs dbus-1)
 
 dbus_service: dbus_message dbus_service.c dbus_common.o
-       ${CC} ${CFLAGS} ${LDFLAGS} $(filter-out dbus_message, $^) -o 
dbus_service ${LDLIBS} $(shell pkg-config --cflags --libs dbus-1)
+       ${CC} ${CFLAGS} ${LDFLAGS} $(filter-out dbus_message, $^) -o $@ 
${LDLIBS} $(shell pkg-config --cflags --libs dbus-1)
 
 tests: all
        @if [ `whoami` = "root" ] ;\


-- 
AppArmor mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/apparmor

Reply via email to