Wed Dec 5 18:00:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>

        * src/Makefile.am, tests/Makefile.am: Remove LIBOBJS/LTLIBOBJS
          which were incorrectly committed earlier.

diff --git a/ChangeLog b/ChangeLog
index 9cecb0fd11f648a71ced0e50c5b755f27c35a059..7252b985ac4a30e0c339b9c80440e8d8c420416b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  5 18:00:00 UTC 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/Makefile.am, tests/Makefile.am: Remove LIBOBJS/LTLIBOBJS
+         which were incorrectly committed earlier.
+
 Wed Dec  5 11:24:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * src/virsh.c: quit if initial conection attempt fails

diff --git a/src/Makefile.am b/src/Makefile.am
index 666a737e112abe0127712fb729e9c214045d4688..532c7da1c45ae0e3d558ec3f16c57c8aa13e7902 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,7 @@ SERVER_SOURCES =                                              \
                ../qemud/remote_protocol.c ../qemud/remote_protocol.h
 
 libvirt_la_SOURCES = $(CLIENT_SOURCES) $(SERVER_SOURCES)
-libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) $(LTLIBOBJS) \
+libvirt_la_LIBADD = $(LIBXML_LIBS) $(GNUTLS_LIBS) $(SASL_LIBS) \
                    @CYGWIN_EXTRA_LIBADD@
 libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
                      -version-info @LIBVIRT_VERSION_INFO@ \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fd9ab1ede24ac9aff8504763089aa576affc2d09..cf96419ea73bb0f7ec7eac5bad1ab2d435e0d966 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -72,65 +72,52 @@ xmlrpctest_SOURCES = \
        @top_srcdir@/src/xmlrpc.c \
        @top_srcdir@/src/xmlrpc.h
 
-LIBOBJDIR = ../src/
-
-xmlrpctest_LDFLAGS = $(LIBOBJS)
 xmlrpctest_LDADD = $(LDADDS)
 
 xml2sexprtest_SOURCES = \
        xml2sexprtest.c \
        testutils.c testutils.h
-xml2sexprtest_LDFLAGS = $(LIBOBJS)
 xml2sexprtest_LDADD = $(LDADDS)
 
 sexpr2xmltest_SOURCES = \
        sexpr2xmltest.c \
        testutils.c testutils.h
-sexpr2xmltest_LDFLAGS = $(LIBOBJS)
 sexpr2xmltest_LDADD = $(LDADDS)
 
 xmconfigtest_SOURCES = \
        xmconfigtest.c \
        testutils.c testutils.h
-xmconfigtest_LDFLAGS = $(LIBOBJS)
 xmconfigtest_LDADD = $(LDADDS)
 
 qemuxml2argvtest_SOURCES = \
        qemuxml2argvtest.c \
        testutils.c testutils.h
-qemuxml2argvtest_LDFLAGS = $(LIBOBJS)
 qemuxml2argvtest_LDADD = $(LDADDS)
 
 qemuxml2xmltest_SOURCES = \
        qemuxml2xmltest.c \
        testutils.c testutils.h
-qemuxml2xmltest_LDFLAGS = $(LIBOBJS)
 qemuxml2xmltest_LDADD = $(LDADDS)
 
 virshtest_SOURCES = \
        virshtest.c \
        testutils.c testutils.h
-virshtest_LDFLAGS = $(LIBOBJS)
 virshtest_LDADD = $(LDADDS)
 
 conftest_SOURCES = \
        conftest.c
-conftest_LDFLAGS = $(LIBOBJS)
 conftest_LDADD = $(LDADDS)
 
 xencapstest_SOURCES = \
        xencapstest.c testutils.h testutils.c
-xencapstest_LDFLAGS = $(LIBOBJS)
 xencapstest_LDADD = $(LDADDS)
 
 nodeinfotest_SOURCES = \
        nodeinfotest.c testutils.h testutils.c
-nodeinfotest_LDFLAGS = $(LIBOBJS)
 nodeinfotest_LDADD = $(LDADDS)
 
 reconnect_SOURCES = \
        reconnect.c
-reconnect_LDFLAGS = $(LIBOBJS)
 reconnect_LDADD = $(LDADDS)
 
 $(LIBVIRT):