diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-09 15:59:28 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:17 +0200 |
| commit | 088edf82b3d34409ed9d9fd09ec1f7e9b933304f (patch) | |
| tree | b5515cf92d243d3453062a5bc975a494142442d3 /Makefile.common | |
| parent | 795bb19daea966401df15bbf23c57b98848eec23 (diff) | |
| download | external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.zip external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.tar.gz external_qemu-088edf82b3d34409ed9d9fd09ec1f7e9b933304f.tar.bz2 | |
os-posix.c + os-win32.c and dependencies
+ Generate qemu-options.def instead of qemu-options.h
Change-Id: I043e6b0c1c58e5cc2e96d05465f39b42f9054b5a
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 15d6801..c80b939 100644 --- a/Makefile.common +++ b/Makefile.common @@ -592,9 +592,10 @@ $(call end-emulator-library) ### ### This defines a function that can be used inside a module definition ### -### $(call gen-hx-header,<input>,<source-files>) +### $(call gen-hx-header,<input>,<output>,<source-files>) ### ### Where: <input> is the input file, with a .hx suffix (e.g. foo.hx) +### <output> is the output file, with a .h or .def suffix ### <source-files> is a list of source files that include the header ### @@ -602,16 +603,16 @@ $(call end-emulator-library) gen-hx-header = $(eval $(call gen-hx-header-ev,$1,$2,$3)) define gen-hx-header-ev -intermediates := $$(call intermediates-dir-for,EXECUTABLES,$$(LOCAL_MODULE),true) - -QEMU_HEADER_H := $$(intermediates)/$$(1:%.hx=%.h) +intermediates := $$(call intermediates-dir-for,$$(EMULATOR_MODULE_TYPE),$$(LOCAL_MODULE),true) +QEMU_HEADER_H := $$(intermediates)/$$2 $$(QEMU_HEADER_H): PRIVATE_PATH := $$(LOCAL_PATH) $$(QEMU_HEADER_H): PRIVATE_CUSTOM_TOOL = $$(PRIVATE_PATH)/hxtool -h < $$< > $$@ $$(QEMU_HEADER_H): $$(LOCAL_PATH)/$$1 $$(LOCAL_PATH)/hxtool $$(transform-generated-source) LOCAL_GENERATED_SOURCES += $$(QEMU_HEADER_H) -_objects := $$(patsubst %,$$(intermediates)/%,$$(2:.c=.o)) +LOCAL_C_INCLUDES += $$(intermediates) +_objects := $$(patsubst %,$$(intermediates)/%,$$(3:.c=.o)) $$(_objects): $$(QEMU_HEADER_H) endef |