Split common routines from kboot parser

[petitboot] / rules.mk

diff --git a/rules.mk b/rules.mk
index 9b6d5ba110bf013059efde0c2f3d35291e42ceba..8d6aba849ad98fefc77e97c88a4cb40bc2539240 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -2,6 +2,7 @@
 VPATH = $(srcdir)
 
 CPPFLAGS += -I$(top_srcdir) -I$(top_srcdir)/lib -I$(builddir)
+LDFLAGS += $(CFLAGS)
 
 # we need paths to be overridable at build-time
 DEFS += '-DPREFIX="$(prefix)"' '-DPKG_SHARE_DIR="$(pkgdatadir)"' \
@@ -16,7 +17,6 @@ parser_test = test/parser-test
 
 # install targets and components
 daemons = $(pb_discover)
-#parsers = kboot native yaboot (todo)
 parsers = kboot
 uis = $(pb_test)
 tests = $(parser_test)
@@ -38,6 +38,7 @@ waiter_objs = lib/waiter/waiter.o
 
 # daemon objs
 parser_objs = discover/parser.o discover/parser-utils.o \
+       discover/parser-conf.o\
        $(foreach p, $(parsers), discover/$(p)-parser.o)
 discover_objs = discover/udev.o discover/discover-server.o \
        discover/device-handler.o discover/paths.o
@@ -109,7 +110,7 @@ install: all $(rules)
        $(INSTALL) $(addprefix $(top_srcdir)/ui/twin/artwork/,$(artwork)) \
                $(DESTDIR)$(pkgdatadir)/artwork/
        $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/utils
-       $(INSTALL) $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
+       $(INSTALL) -m 644 $(top_srcdir)/$(rules) $(DESTDIR)$(pkgdatadir)/utils
 
 dist: $(PACKAGE)-$(VERSION).tar.gz
 
@@ -124,10 +125,10 @@ $(PACKAGE)-$(VERSION).tar.gz: $(PACKAGE)-$(VERSION)
        tar czvf $@ $^
 
 $(PACKAGE)-$(VERSION): clean
-       for f in $$(git-ls-files); do \
+       for f in $$(git --git-dir=$(top_srcdir)/.git ls-files); do \
                d=$@/$$(dirname $$f); \
                mkdir -p $$d; \
-               cp -a $$f $$d; \
+               cp -a $(top_srcdir)/$$f $$d; \
        done
 
 clean: