X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2FMakefile.am;h=b240106d7a546d637845d168f0b33fbdefdd12f0;hp=902f94f331400d65fefbad964c587e37186d9b87;hb=c3dfc9b7b91045172d460651c0309b09b0ab121a;hpb=fcbb46482c413192756ce865a7336c5638fda6d3

diff --git a/discover/grub2/Makefile.am b/discover/grub2/Makefile.am
index 902f94f..b240106 100644
--- a/discover/grub2/Makefile.am
+++ b/discover/grub2/Makefile.am
@@ -12,38 +12,47 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
-AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(DEFAULT_CPPFLAGS)
-
-AM_CFLAGS = $(DEFAULT_CFLAGS)  \
-	-DPREFIX='"$(prefix)"' \
-	-DPKG_SHARE_DIR='"$(pkgdatadir)"' \
-	-DPKG_SYSCONF_DIR='"$(pkgsysconfdir)"' \
-	-DLOCAL_STATE_DIR='"$(localstatedir)"'
-
-AM_YFLAGS = -d
-
-noinst_PROGRAMS = grub2-parser.ro
-
-grub2-parser.ro$(EXEEXT): $(grub2_parser_ro_OBJECTS)
-	$(LD) -r -o $@ $^
-
-
-grub2_parser_ro_SOURCES = \
-	builtins.c \
-	env.c \
-	grub2.h \
-	grub2.c \
-	lexer.l \
-	parser.y \
-	script.c \
-	parser.c
-
-BUILT_SOURCES = parser.h lexer.h
+noinst_PROGRAMS += discover/grub2/grub2-parser.ro
+
+discover_grub2_grub2_parser_ro_SOURCES = \
+	discover/grub2/blscfg.c \
+	discover/grub2/builtins.c \
+	discover/grub2/env.c \
+	discover/grub2/grub2.h \
+	discover/grub2/grub2.c \
+	discover/grub2/grub2-lexer.l \
+	discover/grub2/grub2-parser.y \
+	discover/grub2/script.c
+
+BUILT_SOURCES += \
+	discover/grub2/grub2-parser.c \
+	discover/grub2/grub2-parser.h \
+	discover/grub2/grub2-lexer.h \
+	discover/grub2/grub2-lexer.c
+
+CLEANFILES += \
+	discover/grub2/grub2-parser.c \
+	discover/grub2/grub2-parser.h \
+	discover/grub2/grub2-lexer.c \
+	discover/grub2/grub2-lexer.h
+
+discover_grub2_grub2_parser_ro_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/discover/grub2 \
+	-I$(top_builddir)/discover/grub2
+
+discover_grub2_grub2_parser_ro_LINK = \
+	$(LD) -r -o $@
 
 # ylwrap doesn't handle flex header files well; use our own rule here.
-lexer.h lexer.c: lexer.l
-	$(LEX) $(LFLAGS) --header-file=lexer.h -o lexer.c $^
+discover/grub2/grub2-lexer.h discover/grub2/grub2-lexer.c: \
+		$(top_srcdir)/discover/grub2/grub2-lexer.l
+	$(AM_V_LEX)$(LEXCOMPILE) --header-file=discover/grub2/grub2-lexer.h \
+				       -o discover/grub2/grub2-lexer.c $^
 
-lexer.o: CFLAGS+=-Wno-unused-parameter -Wno-missing-prototypes \
-		       -Wno-missing-declarations
+# We need to loosen our warnings for the generated lexer code.
+discover/grub2/%grub2-lexer.o discover/grub2/grub2-lexer.o: \
+		AM_CFLAGS += -Wno-unused-parameter -Wno-missing-prototypes \
+			       -Wno-missing-declarations -Wno-sign-compare
 
+$(discover_grub2_grub2_parser_ro_OBJECTS): discover/grub2/grub2-parser.h