Revision 0f94d6da

b/configure
146 146
docdir="\${prefix}/share/doc/qemu"
147 147
bindir="\${prefix}/bin"
148 148
libdir="\${prefix}/lib"
149
includedir="\${prefix}/include"
149 150
sysconfdir="\${prefix}/etc"
150 151
confsuffix="/qemu"
151 152
slirp="yes"
......
539 540
  ;;
540 541
  --libdir=*) libdir="$optarg"
541 542
  ;;
543
  --includedir=*) includedir="$optarg"
544
  ;;
542 545
  --datadir=*) datadir="$optarg"
543 546
  ;;
544 547
  --docdir=*) docdir="$optarg"
......
2542 2545
echo "BIOS directory    `eval echo $datadir`"
2543 2546
echo "binary directory  `eval echo $bindir`"
2544 2547
echo "library directory `eval echo $libdir`"
2548
echo "include directory `eval echo $includedir`"
2545 2549
echo "config directory  `eval echo $sysconfdir`"
2546 2550
if test "$mingw32" = "no" ; then
2547 2551
echo "Manual directory  `eval echo $mandir`"
......
2635 2639
echo "prefix=$prefix" >> $config_host_mak
2636 2640
echo "bindir=$bindir" >> $config_host_mak
2637 2641
echo "libdir=$libdir" >> $config_host_mak
2642
echo "includedir=$includedir" >> $config_host_mak
2638 2643
echo "mandir=$mandir" >> $config_host_mak
2639 2644
echo "datadir=$datadir" >> $config_host_mak
2640 2645
echo "sysconfdir=$sysconfdir" >> $config_host_mak
b/libcacard/Makefile
2 2
-include $(SRC_PATH)/Makefile.objs
3 3
-include $(SRC_PATH)/rules.mak
4 4

  
5
$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/libcacard)
5
libcacard_srcpath=$(SRC_PATH)/libcacard
6
libcacard_includedir=$(includedir)/cacard
7

  
8
$(call set-vpath, $(SRC_PATH):$(libcacard_srcpath))
6 9

  
7 10
# objects linked against normal qemu binaries, not compiled with libtool
8 11
QEMU_OBJS=$(addprefix ../,$(oslib-obj-y) qemu-malloc.o qemu-timer-common.o $(trace-obj-y))
......
18 21
	$(call quiet-command,$(CC) $(libcacard_libs) -lrt -o $@ $^,"  LINK  $@")
19 22

  
20 23
clean:
21
	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la
24
	rm -f *.o */*.o *.d */*.d *.a */*.a *~ */*~ vscclient *.lo .libs/* *.la *.pc
22 25
	rm -Rf .libs
23 26

  
24 27
all: vscclient
......
36 39
libcacard.la: $(libcacard.lib-y) $(QEMU_OBJS_LIB)
37 40
	$(call quiet-command,libtool --mode=link --quiet --tag=CC $(CC) $(libcacard_libs) -lrt -rpath $(libdir) -o $@ $^,"  lt LINK $@")
38 41

  
39
install-libcacard: libcacard.la
42
libcacard.pc: $(libcacard_srcpath)/libcacard.pc.in
43
	sed -e 's|@LIBDIR@|$(libdir)|' \
44
		-e 's|@INCLUDEDIR@|$(libcacard_includedir)|' \
45
	    -e 's|@VERSION@|$(shell cat $(SRC_PATH)/VERSION)|' \
46
		-e 's|@PREFIX@|$(prefix)|' \
47
		< $(libcacard_srcpath)/libcacard.pc.in > libcacard.pc
48

  
49
.PHONY: install-libcacard
50

  
51
install-libcacard: libcacard.pc libcacard.la vscclient
40 52
	$(INSTALL_DIR) "$(DESTDIR)$(libdir)"
53
	$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig"
54
	$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)"
55
	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
56
	libtool --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
41 57
	libtool --mode=install $(INSTALL_PROG) libcacard.la "$(DESTDIR)$(libdir)"
58
	libtool --mode=install $(INSTALL_PROG) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
59
	for inc in *.h; do \
60
		libtool --mode=install $(INSTALL_PROG) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
61
	done
62

  
42 63
endif
b/libcacard/libcacard.pc.in
1
prefix=@PREFIX@
2
exec_prefix=${prefix}
3
libdir=@LIBDIR@
4
includedir=@INCLUDEDIR@
5

  
6
Name: cacard
7
Description: CA Card library
8
Version: @VERSION@
9

  
10
Requires:  nss
11
Libs: -L${libdir} -lcacard
12
Libs.private:
13
Cflags: -I${includedir}

Also available in: Unified diff