Revision 992aeb8e Makefile

b/Makefile
104 104
-include config-all-devices.mak
105 105
-include config-all-disas.mak
106 106

  
107
ifneq ($(wildcard config-host.mak),)
108
include $(SRC_PATH)/Makefile.objs
109
include $(SRC_PATH)/tests/Makefile
110
endif
111
ifeq ($(CONFIG_SMARTCARD_NSS),y)
112
include $(SRC_PATH)/libcacard/Makefile
113
endif
114

  
107 115
all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
108 116

  
109 117
config-host.h: config-host.h-timestamp
......
116 124
subdir-%:
117 125
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
118 126

  
119
ifneq ($(wildcard config-host.mak),)
120
include $(SRC_PATH)/Makefile.objs
121
endif
122

  
123
subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o
124

  
125 127
subdir-pixman: pixman/Makefile
126 128
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,)
127 129

  
......
158 160
libqemustub.a: $(stub-obj-y)
159 161

  
160 162
######################################################################
161
# Support building shared library libcacard
162

  
163
ifeq ($(CONFIG_SMARTCARD_NSS),y)
164
.PHONY: libcacard.la install-libcacard
165
libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
166
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,)
167

  
168
install-libcacard: libcacard.la
169
	$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,)
170
endif
171

  
172
######################################################################
173 163

  
174 164
qemu-img.o: qemu-img-cmds.h
175 165

  
......
183 173

  
184 174
qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o
185 175

  
186
vscclient$(EXESUF): LIBS += $(libcacard_libs)
187
vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a
188
	$(call LINK, $^)
189

  
190 176
fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y)
191 177
fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
192 178

  
......
198 184

  
199 185
gen-out-type = $(subst .,-,$(suffix $@))
200 186

  
201
ifneq ($(wildcard config-host.mak),)
202
include $(SRC_PATH)/tests/Makefile
203
endif
204

  
205 187
qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
206 188

  
207 189
qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
......
236 218
	rm -f qemu-options.def
237 219
	find . -name '*.[od]' -type f -exec rm -f {} +
238 220
	rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~
221
	rm -f *.la
239 222
	rm -Rf .libs
240 223
	rm -f qemu-img-cmds.h
241 224
	@# May not be present in GENERATED_HEADERS

Also available in: Unified diff