Revision fe0d4d3f

b/Makefile
40 40

  
41 41
-include config-all-devices.mak
42 42

  
43
build-all: config-host.h
43
build-all: config-host.h config-all-devices.h
44 44
	$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) $(TOOLS) $(DOCS) recurse-all,)
45 45

  
46 46
config-host.h: config-host.h-timestamp
47 47
config-host.h-timestamp: config-host.mak
48 48

  
49
config-all-devices.h: config-all-devices.h-timestamp
50
config-all-devices.h-timestamp: config-all-devices.mak
51

  
49 52
SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
50 53

  
51
subdir-%: config-host.h
54
subdir-%: config-host.h config-all-devices.h
52 55
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
53 56

  
54 57
$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
b/Makefile.target
30 30
config-target.h: config-target.h-timestamp
31 31
config-target.h-timestamp: config-target.mak
32 32

  
33
all: config-target.h
33
config-devices.h: config-devices.h-timestamp
34
config-devices.h-timestamp: config-devices.mak
35

  
36
all: config-target.h config-devices.h
34 37
	$(call quiet-command, $(MAKE) $(PROGS),)
35 38

  
36 39
# Dummy command so that make thinks it has done something
b/config.h
1 1

  
2 2
#include "config-host.h"
3 3
#include "config-target.h"
4

  
5
/* We want to include different config files for specific targets
6
   And for the common library.  They need a different name because
7
   we don't want to rely in paths */
8

  
9
#if defined(NEED_CPU_H)
10
#include "config-devices.h"
11
#else
12
#include "config-all-devices.h"
13
#endif

Also available in: Unified diff