[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Mak
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Makefile |
Date: |
Fri, 21 Dec 2012 17:05:30 +0100 |
Rename variables to follow the conventions of the rest of the build
systems.
Signed-off-by: Paolo Bonzini <address@hidden>
---
libcacard/Makefile | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/libcacard/Makefile b/libcacard/Makefile
index a526eae..ddab5d8 100644
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -7,17 +7,15 @@ libcacard_includedir=$(includedir)/cacard
$(call set-vpath, $(SRC_PATH))
# objects linked into a shared library, built with libtool with -fPIC if
required
-QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o error.o $(trace-obj-y)
$(stub-obj-y)
-QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS))
+libcacard-obj-y=$(oslib-obj-y) error.o $(trace-obj-y) $(stub-obj-y)
$(libcacard-y)
+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../
-libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y))
-
-vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o
+vscclient: vscclient.o $(libcacard-obj-y)
$(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS)," LINK
$@")
clean:
@@ -31,7 +29,7 @@ all: libcacard.la libcacard.pc
#########################################################################
# Rules for building libcacard standalone library
-libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
+libcacard.la: $(libcacard-lobj-y)
$(call quiet-command,$(LIBTOOL) --mode=link --tag=CC $(CC) -rpath
$(libdir) -o $@ $^ $(libcacard_libs)," lt LINK $@")
libcacard_srcpath=$(SRC_PATH)/libcacard
--
1.7.1
- [Qemu-devel] [PATCH 00/27] More source reorganization and build system TLC, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 01/27] qemu-option: move standard option definitions out of qemu-config.c, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 03/27] build: make libtool verbose when making with V=1, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 05/27] build: move dtrace rules to rules.mak, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 04/27] build: support linking with libtool objects/libraries, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 02/27] stubs: fully replace qemu-tool.c and qemu-user.c, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 07/27] libcacard: fix missing symbol in libcacard.so, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 06/27] build: remove CONFIG_SMARTCARD, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 08/27] libcacard: require libtool to build it, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 09/27] libcacard: prepare to use -y trick in the Makefile,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 11/27] libcacard: add list of exported symbols, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 10/27] libcacard: use per-target variable definitions, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 13/27] libcacard: link vscclient to dynamic library, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 14/27] libcacard: list oslib-obj-y file explicitly, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 12/27] libcacard: rewrite Makefile in non-recursive style, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 15/27] build: rename oslib-obj-y to util-obj-y, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 18/27] build: move libqemuutil.a components to util/, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 16/27] build: move util-obj-y to libqemuutil.a, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 23/27] build: move version-obj-y to the generic LINK rule, Paolo Bonzini, 2012/12/21
- [Qemu-devel] [PATCH 20/27] build: consolidate multiple variables into universal-obj-y, Paolo Bonzini, 2012/12/21