xen: start PCI hole at 0xe0000000 (same as pc_init1 and qemu-xen-traditional)

[qemu.git] / libcacard / Makefile

diff --git a/libcacard/Makefile b/libcacard/Makefile
index 487f43489430d269fd95c496d96b80c788a7c18f..47827a0eb894132d1c3a28bb87382357b32b1d2b 100644 (file)
--- a/libcacard/Makefile
+++ b/libcacard/Makefile
@@ -1,63 +1,49 @@
--include ../config-host.mak
--include $(SRC_PATH)/Makefile.objs
--include $(SRC_PATH)/rules.mak
-
 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
-QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y)
-QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS))
-
-QEMU_CFLAGS+=-I../
-
-libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y))
+libcacard-obj-y = $(stub-obj-y) $(libcacard-y)
+libcacard-obj-y += util/osdep.o util/cutils.o util/qemu-timer-common.o util/error.o
+libcacard-obj-$(CONFIG_WIN32) += util/oslib-win32.o util/qemu-thread-win32.o
+libcacard-obj-$(CONFIG_POSIX) += util/oslib-posix.o util/qemu-thread-posix.o
+libcacard-obj-y += $(filter trace/%, $(util-obj-y))
 
-vscclient: $(libcacard-y) $(QEMU_OBJS) vscclient.o cutils.o
-       $(call quiet-command,$(CC) -o $@ $^ $(libcacard_libs) $(LIBS),"  LINK  $@")
+libcacard-lobj-y=$(patsubst %.o,%.lo,$(libcacard-obj-y))
 
-clean:
-       rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo */*.lo .libs/* */.libs/* *.la */*.la *.pc
-       rm -Rf .libs */.libs
+# libtool will build the .o files, too
+$(libcacard-obj-y): | $(libcacard-lobj-y)
 
 all: libcacard.la libcacard.pc
-# Dummy command so that make thinks it has done something
-       @true
+
+vscclient$(EXESUF): libcacard/vscclient.o libcacard.la
+       $(call LINK,$^)
 
 #########################################################################
 # Rules for building libcacard standalone library
 
-ifeq ($(LIBTOOL),)
-libcacard.la:
-       @echo "libtool is missing, please install and rerun configure"; exit 1
-
-install-libcacard:
-       @echo "libtool is missing, please install and rerun configure"; exit 1
-else
-libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
-       $(call quiet-command,$(LIBTOOL) --mode=link --quiet --tag=CC $(CC) -rpath $(libdir) -o $@ $^ $(libcacard_libs),"  lt LINK $@")
+libcacard.la: LDFLAGS += -rpath $(libdir) -no-undefined \
+       -export-syms $(SRC_PATH)/libcacard/libcacard.syms
+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)"
-       $(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
-       $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)"
-       $(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
-       for inc in *.h; do \
-               $(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
+       $(INSTALL_LIB) libcacard.la "$(DESTDIR)$(libdir)"
+       $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
+       for inc in $(SRC_PATH)/libcacard/*.h; do \
+               $(INSTALL_DATA) $$inc "$(DESTDIR)$(libcacard_includedir)"; \
        done
-endif