Use CPPFLAGS for -I arguments

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index f8d64c61752b3d0c505740c33dea4e8d5850a50f..8ccdc5d955456e604fa363c43afa4e57f28a7b4d 100644 (file)
--- 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
@@ -43,6 +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/paths.o \
                   $(talloc_objs) $(server_objs) $(list_objs)
 
 discover/pb-discover: $(pb_discover_objs)