From patchwork Fri Dec 21 16:05:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 207843 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 799582C008A for ; Sat, 22 Dec 2012 03:52:35 +1100 (EST) Received: from localhost ([::1]:60175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm58C-0007cR-Ry for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 11:07:28 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57Q-0005yZ-90 for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm57M-0006qx-ET for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:40 -0500 Received: from mail-ia0-f175.google.com ([209.85.210.175]:38021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57M-0006qt-8J for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:36 -0500 Received: by mail-ia0-f175.google.com with SMTP id z3so4034590iad.34 for ; Fri, 21 Dec 2012 08:06:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=/nT3v1D8VJbmBNZwXZt242bHnqh86I4/vEysHHufVkE=; b=Tkx1bi5ar3erR1MJoNkfocXMck2gX77CS6aJSc4E2hyLIgkdzDhI03xtYJo26gDWXi rR4EjBnnSZLPVlqpcejoHkrnCdS4VC2ktOzrfEwLrZ2+EaMIw3tsNqwzy8UoKDpweEKE ynMp9q6FgP9WpD6BcG4hEJBrM2mICuGkxmBqu0rDZHofYLPEZwh2Z/0bEp33B8159Tc9 1aH4HZ7SR2xiirLOj6jWJlw66ENyvN8B1nUhckJIlFcnQ+1QLkhJ3HA0YdTQmztHJyjX Lfmyz4XZI6Ej2GcWhVPjEt3dVcl4oIzcQEDbPQLGOx4+S7FpavOrW8VVb5z5+FQjGNU5 sSCQ== X-Received: by 10.50.214.2 with SMTP id nw2mr9195357igc.110.1356105995828; Fri, 21 Dec 2012 08:06:35 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u4sm9757244igw.6.2012.12.21.08.06.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:06:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2012 17:05:33 +0100 Message-Id: <1356105948-13216-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> References: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.175 Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Subject: [Qemu-devel] [PATCH 12/27] libcacard: rewrite Makefile in non-recursive style X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- Makefile | 35 +++++++++-------------------------- configure | 9 +-------- libcacard/Makefile | 33 +++++++++------------------------ 3 files changed, 19 insertions(+), 58 deletions(-) diff --git a/Makefile b/Makefile index 68e3a83..92f62e3 100644 --- a/Makefile +++ b/Makefile @@ -101,6 +101,14 @@ defconfig: -include config-all-devices.mak -include config-all-disas.mak +ifneq ($(wildcard config-host.mak),) +include $(SRC_PATH)/Makefile.objs +include $(SRC_PATH)/tests/Makefile +endif +ifeq ($(CONFIG_SMARTCARD_NSS),y) +include $(SRC_PATH)/libcacard/Makefile +endif + all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all config-host.h: config-host.h-timestamp @@ -113,12 +121,6 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) subdir-%: $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,) -ifneq ($(wildcard config-host.mak),) -include $(SRC_PATH)/Makefile.objs -endif - -subdir-libcacard: $(oslib-obj-y) $(trace-obj-y) qemu-timer-common.o - subdir-pixman: pixman/Makefile $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C pixman V="$(V)" all,) @@ -155,18 +157,6 @@ version-obj-$(CONFIG_WIN32) += version.o libqemustub.a: $(stub-obj-y) ###################################################################### -# Support building shared library libcacard - -ifeq ($(CONFIG_SMARTCARD_NSS),y) -.PHONY: libcacard.la install-libcacard -libcacard.la: $(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" libcacard.la,) - -install-libcacard: libcacard.la - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C libcacard V="$(V)" TARGET_DIR="$*/" install-libcacard,) -endif - -###################################################################### qemu-img.o: qemu-img-cmds.h @@ -180,10 +170,6 @@ qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) libqemustub.a qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o -vscclient$(EXESUF): LIBS += $(libcacard_libs) -vscclient$(EXESUF): $(libcacard-y) $(oslib-obj-y) $(trace-obj-y) libcacard/vscclient.o libqemustub.a - $(call LINK, $^) - fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o fsdev/virtio-9p-marshal.o oslib-posix.o $(trace-obj-y) fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap @@ -195,10 +181,6 @@ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated gen-out-type = $(subst .,-,$(suffix $@)) -ifneq ($(wildcard config-host.mak),) -include $(SRC_PATH)/tests/Makefile -endif - qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\ @@ -233,6 +215,7 @@ clean: rm -f qemu-options.def find . -name '*.[od]' -exec rm -f {} + rm -f *.a *.lo $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ + rm -f *.la rm -Rf .libs rm -f qemu-img-cmds.h rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp diff --git a/configure b/configure index e3533e2..f521920 100755 --- a/configure +++ b/configure @@ -3130,9 +3130,6 @@ if test "$softmmu" = yes ; then tools="qemu-ga\$(EXESUF) $tools" fi fi - if test "$smartcard_nss" = "yes" ; then - tools="vscclient\$(EXESUF) $tools" - fi fi # Mac OS X ships with a broken assembler @@ -3963,9 +3960,6 @@ fi if test "$target_softmmu" = "yes" ; then echo "CONFIG_SOFTMMU=y" >> $config_target_mak echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak - if test "$smartcard_nss" = "yes" ; then - echo "subdir-$target: subdir-libcacard" >> $config_host_mak - fi case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak @@ -4166,10 +4160,9 @@ DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" DIRS="$DIRS roms/seabios roms/vgabios" DIRS="$DIRS qapi-generated" -DIRS="$DIRS libcacard libcacard/libcacard libcacard/trace" FILES="Makefile tests/tcg/Makefile qdict-test-data.txt" FILES="$FILES tests/tcg/cris/Makefile tests/tcg/cris/.gdbinit" -FILES="$FILES tests/tcg/lm32/Makefile libcacard/Makefile" +FILES="$FILES tests/tcg/lm32/Makefile" FILES="$FILES pc-bios/optionrom/Makefile pc-bios/keymaps" FILES="$FILES pc-bios/spapr-rtas/Makefile" FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile" diff --git a/libcacard/Makefile b/libcacard/Makefile index 73fc817..34ef3b4 100644 --- a/libcacard/Makefile +++ b/libcacard/Makefile @@ -1,10 +1,6 @@ --include ../config-host.mak --include $(SRC_PATH)/rules.mak --include $(SRC_PATH)/Makefile.objs - libcacard_includedir=$(includedir)/cacard -$(call set-vpath, $(SRC_PATH)) +TOOLS += vscclient$(EXESUF) # objects linked into a shared library, built with libtool with -fPIC if required libcacard-obj-y=$(oslib-obj-y) error.o $(trace-obj-y) $(stub-obj-y) $(libcacard-y) @@ -13,20 +9,12 @@ libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y)) # libtool will build the .o files, too $(libcacard-obj-y): | $(libcacard-lobj-y) -QEMU_CFLAGS+=-I../ +all: libcacard.la libcacard.pc -vscclient: LIBS += $(libcacard_libs) -vscclient: vscclient.o $(libcacard-obj-y) +vscclient$(EXESUF): LIBS += $(libcacard_libs) +vscclient$(EXESUF): libcacard/vscclient.o $(libcacard-obj-y) $(call LINK,$^) -clean: - rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc - rm -Rf .libs */.libs - -all: libcacard.la libcacard.pc -# Dummy command so that make thinks it has done something - @true - ######################################################################### # Rules for building libcacard standalone library @@ -36,25 +24,22 @@ libcacard.la: LIBS += $(libcacard_libs) libcacard.la: $(libcacard-lobj-y) $(call LINK,$^) -libcacard_srcpath=$(SRC_PATH)/libcacard -libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in +libcacard.pc: $(SRC_PATH)/libcacard/libcacard.pc.in $(call quiet-command,sed -e 's|@LIBDIR@|$(libdir)|' \ -e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \ -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \ - -e 's|@PREFIX@|$(prefix)|' \ - < $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc,\ + -e 's|@PREFIX@|$(prefix)|' $< > libcacard.pc,\ " GEN $@") .PHONY: install-libcacard -install-libcacard: libcacard.pc libcacard.la vscclient +install: install-libcacard +install-libcacard: libcacard.pc libcacard.la $(INSTALL_DIR) "$(DESTDIR)$(libdir)" $(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" $(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" - $(INSTALL_DIR) "$(DESTDIR)$(bindir)" - $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" $(INSTALL_LIB) libcacard.la "$(DESTDIR)$(libdir)" $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" for inc in *.h; do \ - $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ + $(INSTALL_DATA) $(SRC_PATH)/libcacard/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ done