[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 48/81] Fold BRLAPI_LIBS into libs_softmmu
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 48/81] Fold BRLAPI_LIBS into libs_softmmu |
Date: |
Mon, 3 Aug 2009 14:46:39 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 3 ---
Makefile.target | 2 +-
configure | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index cd130a0..1b7839a 100644
--- a/Makefile
+++ b/Makefile
@@ -92,9 +92,6 @@ obj-y += msmouse.o ps2.o
obj-y += qdev.o qdev-properties.o ssi.o
obj-$(CONFIG_BRLAPI) += baum.o
-
-LIBS+=$(BRLAPI_LIBS)
-
obj-$(CONFIG_WIN32) += tap-win32.o
obj-$(CONFIG_POSIX) += migration-exec.o
diff --git a/Makefile.target b/Makefile.target
index 705b8df..d13309a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -400,7 +400,7 @@ vl.o: qemu-options.h
monitor.o: qemu-monitor.h
-LIBS += $(COCOA_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS)
+LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # !CONFIG_USER_ONLY
diff --git a/configure b/configure
index 4a19917..fd7c6b0 100755
--- a/configure
+++ b/configure
@@ -1059,6 +1059,7 @@ int main( void ) { return brlapi__openConnection (NULL,
NULL, NULL); }
EOF
if compile_prog "" "$brlapi_libs" ; then
brlapi=yes
+ libs_softmmu="$brlapi_libs $libs_softmmu"
fi
fi
@@ -1686,7 +1687,6 @@ if test "$curl" = "yes" ; then
fi
if test "$brlapi" = "yes" ; then
echo "CONFIG_BRLAPI=y" >> $config_host_mak
- echo "BRLAPI_LIBS=$brlapi_libs" >> $config_host_mak
fi
if test "$bluez" = "yes" ; then
echo "CONFIG_BLUEZ=y" >> $config_host_mak
--
1.6.2.5
- [Qemu-devel] [PATCH 38/81] move coreaudio libraries to coreaudio selection, (continued)
- [Qemu-devel] [PATCH 38/81] move coreaudio libraries to coreaudio selection, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 39/81] Move sound library selection to sound selection, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 40/81] files are only compiled when CONFIG_ADLIB is defined, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 41/81] Test if we need -lutil in ,/configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 42/81] Fold CURSES_LIBS into libsoftmmu_libs, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 43/81] Fold VNC_TLS_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 44/81] Fold VNC_SASL_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 45/81] Fold XEN_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 46/81] Fold BLUEZ_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 47/81] Fold FDT_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 48/81] Fold BRLAPI_LIBS into libs_softmmu,
Juan Quintela <=
- [Qemu-devel] [PATCH 49/81] remove duplicated TARGET_GPROF code, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 50/81] \!CONFIG_USER_ONLY == CONFIG_SOFTMMU, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 51/81] Introduce CONFIG_NOSOFTFLOAT and simplify Makefile.target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 52/81] permit to add things to LDFLAGS for target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 53/81] refactor linker_script common part and change quoting, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 54/81] permit to add things to CFLAGS per target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 55/81] fix typo, there should be bsd_user there, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 56/81] Move alpha CFLAGS target to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 57/81] Move ia64 QEMU_CFLAGS target to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 58/81] this bit was already generated in configure, Juan Quintela, 2009/08/03