X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=rules.mk;h=3a343c14e96d2e64736541455de125f61cc9b898;hp=00241c30279a8645d52ea7055c4a00e8b8d909d4;hb=b118597194815910897ccf86d77b8b5a066adf5a;hpb=94af239b00f547fb5daef88b16fecdfb0146691b diff --git a/rules.mk b/rules.mk index 00241c3..3a343c1 100644 --- a/rules.mk +++ b/rules.mk @@ -1,10 +1,11 @@ VPATH = $(srcdir) -CFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir) +CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir) # we need paths to be overridable at build-time -DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' +DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \ + '-DLOCAL_STATE_DIR="$(localstatedir)"' #uis = ui/twin/pb-twin uis = ui/test/pb-test @@ -31,7 +32,7 @@ ui/twin/pb-twin: $(pb_twin_objs) # test ui pb_test_objs = ui/test/pb-test.o ui/common/discover-client.o \ - $(talloc_objs) $(server_objs) + $(talloc_objs) $(server_objs) $(list_objs) ui/test/pb-test: $(pb_test_objs) $(LINK.o) -o $@ $^ @@ -43,7 +44,7 @@ ui/test/pb-test: $(pb_test_objs) pb_discover_objs = discover/pb-discover.o discover/udev.o discover/log.o \ discover/waiter.o discover/discover-server.o \ - discover/device-handler.o \ + discover/device-handler.o discover/paths.o \ $(talloc_objs) $(server_objs) $(list_objs) discover/pb-discover: $(pb_discover_objs)