aboutsummaryrefslogtreecommitdiff
path: root/libcacard
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-21 09:16:33 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-01-12 17:19:38 +0100
commit591eca679e6d1165c9c69896dcecc8087bb1619c (patch)
treeeb4c88c15e71a55164706e16198b0dcd3a0ff1e9 /libcacard
parentb6fc675b25d32f018870e202eb4b2a6eb509f88b (diff)
downloadqemu-arm-591eca679e6d1165c9c69896dcecc8087bb1619c.tar.gz
libcacard: prepare to use -y trick in the Makefile
Rename variables to follow the conventions of the rest of the build systems. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'libcacard')
-rw-r--r--libcacard/Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/libcacard/Makefile b/libcacard/Makefile
index a526eaeabd..ddab5d8297 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