Remove the need for explicit make grub-emu

diff --git a/Makefile.in b/Makefile.in
index 853eea9db6898443dfcda7c8f3452d6205a53aaa..e69c18b4076d377ef6cd30ad31f57a54a5d0d9a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -178,7 +178,10 @@ endif
 ### General targets.
 
 CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA) po/*.mo
-pkglib_DATA += moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
+pkglib_DATA += command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst
+ifneq ($(platform), emu)
+pkglib_DATA += moddep.lst
+endif
 moddep.lst: $(DEFSYMFILES) $(UNDSYMFILES) genmoddep.awk
        cat $(DEFSYMFILES) /dev/null \
          | $(AWK) -f $(srcdir)/genmoddep.awk $(UNDSYMFILES) > $@ \
@@ -278,7 +281,7 @@ build_env.mk: Makefile
        ) > $@
 pkglib_BUILDDIR += config.h grub_script.tab.h
 
-all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
+all-local: $(PROGRAMS) $(GRUB_EMU) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(INFOS) $(MKFILES) $(foreach lang, $(LINGUAS), po/$(lang).mo)
 
 install: install-local
 
@@ -299,7 +302,7 @@ install-local: all
          $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(pkgdatadir)/$$dest; \
        done
        $(SHELL) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
-       @list='$(bin_UTILITIES)'; for file in $$list; do \
+       @list='$(bin_UTILITIES) $(GRUB_EMU)'; for file in $$list; do \
          if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
          dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
          $(INSTALL_PROGRAM) $$dir$$file $(DESTDIR)$(bindir)/$$dest; \
@@ -375,7 +378,7 @@ uninstall:
          dest="`echo $$file | sed 's,.*/,,'`"; \
          rm -f $(DESTDIR)$(pkgdatadir)/$$dest; \
        done
-       @list='$(bin_UTILITIES) $(bin_SCRIPTS)'; for file in $$list; do \
+       @list='$(bin_UTILITIES) $(bin_SCRIPTS) $(GRUB_EMU)'; for file in $$list; do \
          dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
          rm -f $(DESTDIR)$(bindir)/$$dest; \
          rm -f $(DESTDIR)$(mandir)/man1/$$dest.1; \

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 0f717c59c90ff88e6e535e1aa135bf77b1c017fc..7e9e349203b7063b56cdc68b8caa08c4539c79fe 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -82,6 +82,7 @@ pci_mod_LDFLAGS = $(COMMON_LDFLAGS)
 grub_emu_LDFLAGS += $(LIBPCIACCESS)
 endif
 
+include $(srcdir)/conf/common.mk
 
 grub_emu_init.h: genemuinitheader.sh $(pkglib_MODULES)
        rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinitheader.sh $(NM)  > $@
@@ -91,8 +92,8 @@ grub_emu_init.c: genemuinit.sh $(pkglib_MODULES)
        rm -f $@; echo $(pkglib_MODULES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
 DISTCLEANFILES += grub_emu_init.c
 
-include $(srcdir)/conf/common.mk
-
+CLEANFILES += grub-emu
 grub-emu: $(pkglib_MODULES) $(pkglib_PROGRAMS)
        $(CC) -o $@ $(pkglib_MODULES) $(pkglib_PROGRAMS) $(grub_emu_LDFLAGS) $(LDFLAGS)
+GRUB_EMU=grub-emu