m68k: fix subx mem, mem instruction

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 677a54b0820929fc1e686078a2197cf6fccd6174..d71dd5bea41667edb8a4f44261a23fcccd2e96a1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -438,21 +438,23 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
 qemu-version.h: FORCE
        $(call quiet-command, \
                (cd $(SRC_PATH); \
-               printf '#define QEMU_PKGVERSION '; \
                if test -n "$(PKGVERSION)"; then \
-                       printf '"$(PKGVERSION)"\n'; \
+                       pkgvers="$(PKGVERSION)"; \
                else \
                        if test -d .git; then \
-                               printf '" ('; \
-                               git describe --match 'v*' 2>/dev/null | tr -d '\n'; \
+                               pkgvers=$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\
                                if ! git diff-index --quiet HEAD &>/dev/null; then \
-                                       printf -- '-dirty'; \
+                                       pkgvers="$${pkgvers}-dirty"; \
                                fi; \
-                               printf ')"\n'; \
-                       else \
-                               printf '""\n'; \
                        fi; \
-               fi) > [email protected])
+               fi; \
+               printf "#define QEMU_PKGVERSION \"$${pkgvers}\"\n"; \
+               if test -n "$${pkgvers}"; then \
+                       printf '#define QEMU_FULL_VERSION QEMU_VERSION " (" QEMU_PKGVERSION ")"\n'; \
+               else \
+                       printf '#define QEMU_FULL_VERSION QEMU_VERSION\n'; \
+               fi; \
+               ) > [email protected])
        $(call quiet-command, if ! cmp -s $@ [email protected]; then \
          mv [email protected] $@; \
         else \
@@ -854,7 +856,7 @@ ifneq ($(BLOBS),)
                $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \
        done
 endif
-ifeq ($(CONFIG_GTK),m)
+ifdef CONFIG_GTK
        $(MAKE) -C po $@
 endif
        $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps"
@@ -1045,10 +1047,16 @@ endif
 include $(SRC_PATH)/tests/docker/Makefile.include
 include $(SRC_PATH)/tests/vm/Makefile.include
 
+printgen:
+       @echo $(GENERATED_FILES)
+
 .PHONY: help
 help:
        @echo  'Generic targets:'
        @echo  '  all             - Build all'
+ifdef CONFIG_MODULES
+       @echo  '  modules         - Build all modules'
+endif
        @echo  '  dir/file.o      - Build specified target only'
        @echo  '  install         - Install QEMU, documentation and tools'
        @echo  '  ctags/TAGS      - Generate tags file for editors'