Revision 21655882
b/configure | ||
---|---|---|
3721 | 3721 |
echo "INSTALL=$install" >> $config_host_mak |
3722 | 3722 |
echo "INSTALL_DIR=$install -d -m 0755" >> $config_host_mak |
3723 | 3723 |
echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak |
3724 |
echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak |
|
3724 |
if test -n "$libtool"; then |
|
3725 |
echo "INSTALL_PROG=\$(LIBTOOL) --mode=install $install -c -m 0755" >> $config_host_mak |
|
3726 |
echo "INSTALL_LIB=\$(LIBTOOL) --mode=install $install -c -m 0644" >> $config_host_mak |
|
3727 |
else |
|
3728 |
echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak |
|
3729 |
echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak |
|
3730 |
fi |
|
3725 | 3731 |
echo "PYTHON=$python" >> $config_host_mak |
3726 | 3732 |
echo "CC=$cc" >> $config_host_mak |
3727 | 3733 |
echo "CC_I386=$cc_i386" >> $config_host_mak |
b/libcacard/Makefile | ||
---|---|---|
10 | 10 |
QEMU_OBJS=$(oslib-obj-y) qemu-timer-common.o $(trace-obj-y) $(stub-obj-y) |
11 | 11 |
QEMU_OBJS_LIB=$(patsubst %.o,%.lo,$(QEMU_OBJS)) |
12 | 12 |
|
13 |
# libtool will build the .o files, too |
|
14 |
$(libcacard-obj-y): | $(libcacard-lobj-y) |
|
15 |
|
|
13 | 16 |
QEMU_CFLAGS+=-I../ |
14 | 17 |
|
15 | 18 |
libcacard.lib-y=$(patsubst %.o,%.lo,$(libcacard-y)) |
... | ... | |
54 | 57 |
$(INSTALL_DIR) "$(DESTDIR)$(libdir)/pkgconfig" |
55 | 58 |
$(INSTALL_DIR) "$(DESTDIR)$(libcacard_includedir)" |
56 | 59 |
$(INSTALL_DIR) "$(DESTDIR)$(bindir)" |
57 |
$(LIBTOOL) --mode=install $(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)"
|
|
58 |
$(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.la "$(DESTDIR)$(libdir)"
|
|
59 |
$(LIBTOOL) --mode=install $(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig"
|
|
60 |
$(INSTALL_PROG) vscclient "$(DESTDIR)$(bindir)" |
|
61 |
$(INSTALL_LIB) libcacard.la "$(DESTDIR)$(libdir)"
|
|
62 |
$(INSTALL_DATA) libcacard.pc "$(DESTDIR)$(libdir)/pkgconfig" |
|
60 | 63 |
for inc in *.h; do \ |
61 |
$(LIBTOOL) --mode=install $(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \
|
|
64 |
$(INSTALL_DATA) $(libcacard_srcpath)/$$inc "$(DESTDIR)$(libcacard_includedir)"; \ |
|
62 | 65 |
done |
63 | 66 |
endif |
b/rules.mak | ||
---|---|---|
23 | 23 |
ifeq ($(LIBTOOL),) |
24 | 24 |
%.lo: %.c |
25 | 25 |
@echo "missing libtool. please install and rerun configure"; exit 1 |
26 |
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ |
|
27 |
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ |
|
28 |
$(LIBS)," LINK $(TARGET_DIR)$@") |
|
26 | 29 |
else |
27 | 30 |
LIBTOOL += $(if $(V),,--quiet) |
28 | 31 |
%.lo: %.c |
29 | 32 |
$(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC $(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," lt CC $@") |
33 |
LINK = $(call quiet-command,\ |
|
34 |
$(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \ |
|
35 |
)$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \ |
|
36 |
$(sort $(filter %.o, $1)) $(filter-out %.o, $1) \ |
|
37 |
$(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK ", " LINK ")"$(TARGET_DIR)$@") |
|
30 | 38 |
endif |
31 | 39 |
|
32 | 40 |
%.asm: %.S |
... | ... | |
38 | 46 |
%.o: %.m |
39 | 47 |
$(call quiet-command,$(OBJCC) $(QEMU_INCLUDES) $(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) -c -o $@ $<," OBJC $(TARGET_DIR)$@") |
40 | 48 |
|
41 |
LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(LIBS)," LINK $(TARGET_DIR)$@") |
|
42 |
|
|
43 | 49 |
%$(EXESUF): %.o |
44 | 50 |
$(call LINK,$^) |
45 | 51 |
|
Also available in: Unified diff