diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:46:33 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:41 -0500 |
| commit | d2ef30d5d3563d874ff85d47bcb43cd910108f05 (patch) | |
| tree | 61e9077236132e73d5983d93e45b7b51cccb6b5e | |
| parent | 6362a53f55c30b0638b1c5dae9c510a94e2926a9 (diff) | |
| download | qemu-d2ef30d5d3563d874ff85d47bcb43cd910108f05.tar.gz | |
Fold CURSES_LIBS into libsoftmmu_libs
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rwxr-xr-x | configure | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Makefile.target b/Makefile.target index 5928135c57..64143618c7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -416,7 +416,7 @@ vl.o: qemu-options.h monitor.o: qemu-monitor.h -LIBS += $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) +LIBS += $(COCOA_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) endif # !CONFIG_USER_ONLY @@ -1074,9 +1074,9 @@ if test "$curses" = "yes" ; then int main(void) { resize_term(0, 0); return curses_version(); } EOF if compile_prog "" "-lncurses" ; then - curses_libs="-lncurses" + libs_softmmu="-lncurses $libs_softmmu" elif compile_prog "" "-lcurses" ; then - curses_libs="-lcurses" + libs_softmmu="-lcurses $libs_softmmu" else curses=no fi @@ -1658,7 +1658,6 @@ if test "$cocoa" = "yes" ; then fi if test "$curses" = "yes" ; then echo "CONFIG_CURSES=y" >> $config_host_mak - echo "CURSES_LIBS=$curses_libs" >> $config_host_mak fi if test "$atfile" = "yes" ; then echo "CONFIG_ATFILE=y" >> $config_host_mak |