From patchwork Fri Dec 21 16:05:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/27] libcacard: prepare to use -y trick in the Makefile Date: Fri, 21 Dec 2012 06:05:30 -0000 From: Paolo Bonzini X-Patchwork-Id: 207864 Message-Id: <1356105948-13216-10-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Rename variables to follow the conventions of the rest of the build systems. Signed-off-by: Paolo Bonzini --- 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