Revision 992aeb8e
| 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 |
| b/configure | ||
|---|---|---|
| 3191 | 3191 |
tools="qemu-ga\$(EXESUF) $tools" |
| 3192 | 3192 |
fi |
| 3193 | 3193 |
fi |
| 3194 |
if test "$smartcard_nss" = "yes" ; then |
|
| 3195 |
tools="vscclient\$(EXESUF) $tools" |
|
| 3196 |
fi |
|
| 3197 | 3194 |
fi |
| 3198 | 3195 |
|
| 3199 | 3196 |
# Mac OS X ships with a broken assembler |
| ... | ... | |
| 4039 | 4036 |
if test "$target_softmmu" = "yes" ; then |
| 4040 | 4037 |
echo "CONFIG_SOFTMMU=y" >> $config_target_mak |
| 4041 | 4038 |
echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak |
| 4042 |
if test "$smartcard_nss" = "yes" ; then |
|
| 4043 |
echo "subdir-$target: subdir-libcacard" >> $config_host_mak |
|
| 4044 |
fi |
|
| 4045 | 4039 |
case "$target_arch2" in |
| 4046 | 4040 |
i386|x86_64) |
| 4047 | 4041 |
echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak |
| ... | ... | |
| 4242 | 4236 |
DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" |
| 4243 | 4237 |
DIRS="$DIRS roms/seabios roms/vgabios" |
| 4244 | 4238 |
DIRS="$DIRS qapi-generated" |
| 4245 |
DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" |
|
| 4246 | 4239 |
FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" |
| 4247 | 4240 |
FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" |
| 4248 |
FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile"
|
|
| 4241 |
FILES="$FILES tests/tcg/lm32/Makefile" |
|
| 4249 | 4242 |
FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" |
| 4250 | 4243 |
FILES="$FILES pc-bios/spapr-rtas/Makefile" |
| 4251 | 4244 |
FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" |
| b/libcacard/Makefile | ||
|---|---|---|
| 1 |
-include ../config-host.mak |
|
| 2 |
-include $(SRC_PATH)/rules.mak |
|
| 3 |
-include $(SRC_PATH)/Makefile.objs |
|
| 4 |
|
|
| 5 | 1 |
libcacard_includedir=$(includedir)/cacard |
| 6 | 2 |
|
| 7 |
$(call set-vpath, $(SRC_PATH))
|
|
| 3 |
TOOLS += vscclient$(EXESUF)
|
|
| 8 | 4 |
|
| 9 | 5 |
# objects linked into a shared library, built with libtool with -fPIC if required |
| 10 | 6 |
libcacard-obj-y=$(oslib-obj-y) error.o $(trace-obj-y) $(stub-obj-y) $(libcacard-y) |
| ... | ... | |
| 13 | 9 |
# libtool will build the .o files, too |
| 14 | 10 |
$(libcacard-obj-y): | $(libcacard-lobj-y) |
| 15 | 11 |
|
| 16 |
QEMU_CFLAGS+=-I../
|
|
| 12 |
all: libcacard.la libcacard.pc
|
|
| 17 | 13 |
|
| 18 |
vscclient: LIBS += $(libcacard_libs) |
|
| 19 |
vscclient: vscclient.o $(libcacard-obj-y)
|
|
| 14 |
vscclient$(EXESUF): LIBS += $(libcacard_libs)
|
|
| 15 |
vscclient$(EXESUF): libcacard/vscclient.o $(libcacard-obj-y)
|
|
| 20 | 16 |
$(call LINK,$^) |
| 21 | 17 |
|
| 22 |
clean: |
|
| 23 |
rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc |
|
| 24 |
rm -Rf .libs */.libs |
|
| 25 |
|
|
| 26 |
all: libcacard.la libcacard.pc |
|
| 27 |
# Dummy command so that make thinks it has done something |
|
| 28 |
@true |
|
| 29 |
|
|
| 30 | 18 |
######################################################################### |
| 31 | 19 |
# Rules for building libcacard standalone library |
| 32 | 20 |
|
| ... | ... | |
| 36 | 24 |
libcacard.la: $(libcacard-lobj-y) |
| 37 | 25 |
$(call LINK,$^) |
| 38 | 26 |
|
| 39 |
libcacard_srcpath=$(SRC_PATH)/libcacard |
|
| 40 |
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in |
|
| 27 |
libcacard.pc: $(SRC_PATH)/libcacard/libcacard.pc.in |
|
| 41 | 28 |
$(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ |
| 42 | 29 |
-e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \ |
| 43 | 30 |
-e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ |
| 44 |
-e 's|@PREFIX@|$(prefix)|' \ |
|
| 45 |
< $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc,\ |
|
| 31 |
-e 's|@PREFIX@|$(prefix)|' $< > libcacard.pc,\ |
|
| 46 | 32 |
" GEN $@") |
| 47 | 33 |
|
| 48 | 34 |
.PHONY: install-libcacard |
| 49 | 35 |
|
| 50 |
install-libcacard: libcacard.pc libcacard.la vscclient |
|
| 36 |
install: install-libcacard |
|
| 37 |
install-libcacard: libcacard.pc libcacard.la |
|
| 51 | 38 |
$(INSTALL_DIR) "$(DESTDIR)$(libdir)" |
| 52 | 39 |
$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" |
| 53 | 40 |
$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" |
| 54 |
$(INSTALL_DIR) "$(DESTDIR)$(bindir)" |
|
| 55 |
$(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" |
|
| 56 | 41 |
$(INSTALL_LIB) libcacard.la "$(DESTDIR)$(libdir)" |
| 57 | 42 |
$(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" |
| 58 |
for inc in *.h; do \ |
|
| 59 |
$(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
|
|
| 43 |
for inc in $(SRC_PATH)/libcacard/*.h; do \
|
|
| 44 |
$(INSTALL_DATA) $$inc "$(DESTDIR)$(libcacard_includedir)"; \ |
|
| 60 | 45 |
done |
Also available in: Unified diff