X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fgrub2%2FMakefile.am;h=b240106d7a546d637845d168f0b33fbdefdd12f0;hp=dda68354246e31102f78446035710b20bef0d673;hb=HEAD;hpb=c43847fe14e6b32cc58b8e8168f78e72ef94316d

diff --git a/discover/grub2/Makefile.am b/discover/grub2/Makefile.am
index dda6835..b240106 100644
--- a/discover/grub2/Makefile.am
+++ b/discover/grub2/Makefile.am
@@ -14,47 +14,45 @@
 
 noinst_PROGRAMS += discover/grub2/grub2-parser.ro
 
-discover/grub2/grub2-parser.ro$(EXEEXT): \
-		$(discover_grub2_grub2_parser_ro_OBJECTS)
-	$(LD) -r -o $@ $^
-
 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/lexer.l \
-	discover/grub2/parser.y \
+	discover/grub2/grub2-lexer.l \
+	discover/grub2/grub2-parser.y \
 	discover/grub2/script.c
 
 BUILT_SOURCES += \
-	discover/grub2/parser.c \
-	discover/grub2/parser.h \
-	discover/grub2/lexer.h \
-	discover/grub2/lexer.c
+	discover/grub2/grub2-parser.c \
+	discover/grub2/grub2-parser.h \
+	discover/grub2/grub2-lexer.h \
+	discover/grub2/grub2-lexer.c
 
 CLEANFILES += \
-	discover/grub2/parser.c \
-	discover/grub2/parser.h \
-	discover/grub2/lexer.c \
-	discover/grub2/lexer.h
-
+	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.
-discover/grub2/lexer.h discover/grub2/lexer.c: \
-		$(top_srcdir)/discover/grub2/lexer.l
-	$(AM_V_LEX)$(LEXCOMPILE) --header-file=discover/grub2/lexer.h \
-				       -o discover/grub2/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 $^
 
 # We need to loosen our warnings for the generated lexer code.
-discover/grub2/%lexer.o discover/grub2/lexer.o: \
+discover/grub2/%grub2-lexer.o discover/grub2/grub2-lexer.o: \
 		AM_CFLAGS += -Wno-unused-parameter -Wno-missing-prototypes \
-			       -Wno-missing-declarations
+			       -Wno-missing-declarations -Wno-sign-compare
 
-$(discover_grub2_grub2_parser_ro_OBJECTS): discover/grub2/parser.h
+$(discover_grub2_grub2_parser_ro_OBJECTS): discover/grub2/grub2-parser.h