[beast/win32: 11/44] Build birnet .la library (instead of trying to build one single .o file).



commit 2515da3e8a768b503be103b00fba94449008b57f
Author: Stefan Westerfeld <stefan space twc de>
Date:   Tue Sep 1 18:45:32 2009 +0200

    Build birnet .la library (instead of trying to build one single .o file).

 birnet/Makefile.am |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/birnet/Makefile.am b/birnet/Makefile.am
index e82f1ad..96dfbfb 100644
--- a/birnet/Makefile.am
+++ b/birnet/Makefile.am
@@ -55,18 +55,14 @@ EXTRA_DIST += configure.inc acbirnet.m4 mksignals.sh
 # name ends in .lo or .o. however automake doesn't know .lo or .o libraries,
 # so we simply build an ordinary non-installed .la library and then use our
 # own rule to build the .o from the .la pieces.
-noinst_LTLIBRARIES         = libbirnet.la
+lib_LTLIBRARIES            = libbirnet.la
 libbirnetincludedir        = $(includedir)/birnet
 libbirnetinclude_HEADERS   = $(birnet_headers) $(birnet_generated_headers)
 libbirnet_la_SOURCES       = $(birnet_sources)
 libbirnet_la_DEPENDENCIES  =
 libbirnet_la_LIBADD        = $(BIRNET_LIBS) -lm
 libbirnet_la_LDFLAGS       = -no-undefined # -Wl,-Bsymbolic
-# keep this .o rule in sync with the corresponding .la rule from Makefile.in
-libbirnet.o: $(libbirnet_la_OBJECTS) $(libbirnet_la_DEPENDENCIES)
-	$(CXXLINK)  $(libbirnet_la_LDFLAGS) $(libbirnet_la_OBJECTS) # $(libbirnet_la_LIBADD) $(LIBS)
-all-am: libbirnet.o
-CLEANFILES += libbirnet.lo libbirnet.o
+CLEANFILES += libbirnet.lo
 EXTRA_DIST += $(birnet_private_headers)
 
 # === birnetconfig.h ===
@@ -153,7 +149,7 @@ birnetsignalvariants.hh: $(srcdir)/birnetsignalslot.hh $(srcdir)/birnetsignaltem
 CLEANFILES += xgen-sigs birnetsignalvariants.hh xgen-signals.sed
 
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd     = libbirnet.o $(BIRNET_LIBS) -lm
+progs_ldadd     = libbirnet.la $(BIRNET_LIBS) -lm
 
 noinst_PROGRAMS       += birnet-zintern
 birnet_zintern_SOURCES = birnet-zintern.cc



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]