From 4f37bc9813cc0b845f8b9d16dd64ce465727bf46 Mon Sep 17 00:00:00 2001 From: knodlseder <> Date: Wed, 1 Nov 2006 12:18:08 +0000 Subject: [PATCH] Build as static library (in particular for profiling) --- src/Makefile.am | 17 ++++++++++++++++- src/Makefile.in | 103 ++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------- test/Makefile.am | 22 ++++++++++++++++++++-- test/Makefile.in | 20 ++++++++++++-------- 4 files changed, 88 insertions(+), 74 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 1ae3f5f..814c1f3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,19 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src test +files = GException.hpp GException.cpp \ + GVector.hpp GVector.cpp \ + GMatrix.hpp GMatrix.cpp \ + GSymMatrix.hpp GSymMatrix.cpp \ + GSparseMatrix.hpp GSparseMatrix.cpp \ + GSparseSymbolic.hpp GSparseSymbolic.cpp \ + GSparseNumeric.hpp GSparseNumeric.cpp +# Build dynamic library +#lib_LTLIBRARIES = libgamma.la +#libgamma_la_SOURCES = $(files) +#libgamma_la_LDFLAGS = + +# Build static library +noinst_LIBRARIES = libgamma.a +libgamma_a_SOURCES = $(files) +#libgamma_a_LDFLAGS = diff --git a/src/Makefile.in b/src/Makefile.in index 5188229..f8b0af5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -SOURCES = $(libgamma_la_SOURCES) +SOURCES = $(libgamma_a_SOURCES) srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -47,20 +47,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(lib_LTLIBRARIES) -libgamma_la_LIBADD = -am__objects_1 = GException.lo GVector.lo GMatrix.lo GSymMatrix.lo \ - GSparseMatrix.lo GSparseSymbolic.lo GSparseNumeric.lo -am_libgamma_la_OBJECTS = $(am__objects_1) -libgamma_la_OBJECTS = $(am_libgamma_la_OBJECTS) +LIBRARIES = $(noinst_LIBRARIES) +ARFLAGS = cru +libgamma_a_AR = $(AR) $(ARFLAGS) +libgamma_a_LIBADD = +am__objects_1 = GException.$(OBJEXT) GVector.$(OBJEXT) \ + GMatrix.$(OBJEXT) GSymMatrix.$(OBJEXT) GSparseMatrix.$(OBJEXT) \ + GSparseSymbolic.$(OBJEXT) GSparseNumeric.$(OBJEXT) +am_libgamma_a_OBJECTS = $(am__objects_1) +libgamma_a_OBJECTS = $(am_libgamma_a_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = am__depfiles_maybe = @@ -80,8 +75,8 @@ LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \ CCLD = $(CC) LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libgamma_la_SOURCES) -DIST_SOURCES = $(libgamma_la_SOURCES) +SOURCES = $(libgamma_a_SOURCES) +DIST_SOURCES = $(libgamma_a_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -182,8 +177,15 @@ files = GException.hpp GException.cpp \ GSparseSymbolic.hpp GSparseSymbolic.cpp \ GSparseNumeric.hpp GSparseNumeric.cpp -lib_LTLIBRARIES = libgamma.la -libgamma_la_SOURCES = $(files) + +# Build dynamic library +#lib_LTLIBRARIES = libgamma.la +#libgamma_la_SOURCES = $(files) +#libgamma_la_LDFLAGS = + +# Build static library +noinst_LIBRARIES = libgamma.a +libgamma_a_SOURCES = $(files) all: all-am .SUFFIXES: @@ -217,35 +219,13 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libgamma.la: $(libgamma_la_OBJECTS) $(libgamma_la_DEPENDENCIES) - $(CXXLINK) -rpath $(libdir) $(libgamma_la_LDFLAGS) $(libgamma_la_OBJECTS) $(libgamma_la_LIBADD) $(LIBS) +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) +libgamma.a: $(libgamma_a_OBJECTS) $(libgamma_a_DEPENDENCIES) + -rm -f libgamma.a + $(libgamma_a_AR) libgamma.a $(libgamma_a_OBJECTS) $(libgamma_a_LIBADD) + $(RANLIB) libgamma.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -349,11 +329,8 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) +all-am: Makefile $(LIBRARIES) installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -380,7 +357,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -400,7 +377,7 @@ info-am: install-data-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-info: install-info-am @@ -425,21 +402,21 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES +uninstall-am: uninstall-info-am .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ + clean-libtool clean-noinstLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-libLTLIBRARIES install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am \ - uninstall-libLTLIBRARIES - + install-exec-am install-info install-info-am install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-info-am + +#libgamma_a_LDFLAGS = # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/test/Makefile.am b/test/Makefile.am index 1ae3f5f..a393564 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,22 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src test - +check_PROGRAMS = test_GVector \ + test_GMatrix \ + test_GSymMatrix \ + test_GSparseMatrix +TESTS = test_GVector \ + test_GMatrix \ + test_GSymMatrix \ + test_GSparseMatrix +test_GVector_SOURCES = test_GVector.cpp +#test_GVector_LDADD = ../src/libgamma.la +test_GVector_LDADD = ../src/libgamma.a +test_GMatrix_SOURCES = test_GMatrix.cpp +#test_GMatrix_LDADD = ../src/libgamma.la +test_GMatrix_LDADD = ../src/libgamma.a +test_GSymMatrix_SOURCES = test_GSymMatrix.cpp +#test_GSymMatrix_LDADD = ../src/libgamma.la +test_GSymMatrix_LDADD = ../src/libgamma.a +test_GSparseMatrix_SOURCES = test_GSparseMatrix.cpp +#test_GSparseMatrix_LDADD = ../src/libgamma.la +test_GSparseMatrix_LDADD = ../src/libgamma.a diff --git a/test/Makefile.in b/test/Makefile.in index b83e5d0..121c441 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -50,16 +50,16 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am_test_GMatrix_OBJECTS = test_GMatrix.$(OBJEXT) test_GMatrix_OBJECTS = $(am_test_GMatrix_OBJECTS) -test_GMatrix_DEPENDENCIES = ../src/libgamma.la +test_GMatrix_DEPENDENCIES = ../src/libgamma.a am_test_GSparseMatrix_OBJECTS = test_GSparseMatrix.$(OBJEXT) test_GSparseMatrix_OBJECTS = $(am_test_GSparseMatrix_OBJECTS) -test_GSparseMatrix_DEPENDENCIES = ../src/libgamma.la +test_GSparseMatrix_DEPENDENCIES = ../src/libgamma.a am_test_GSymMatrix_OBJECTS = test_GSymMatrix.$(OBJEXT) test_GSymMatrix_OBJECTS = $(am_test_GSymMatrix_OBJECTS) -test_GSymMatrix_DEPENDENCIES = ../src/libgamma.la +test_GSymMatrix_DEPENDENCIES = ../src/libgamma.a am_test_GVector_OBJECTS = test_GVector.$(OBJEXT) test_GVector_OBJECTS = $(am_test_GVector_OBJECTS) -test_GVector_DEPENDENCIES = ../src/libgamma.la +test_GVector_DEPENDENCIES = ../src/libgamma.a DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = am__depfiles_maybe = @@ -173,13 +173,17 @@ TESTS = test_GVector \ test_GSparseMatrix test_GVector_SOURCES = test_GVector.cpp -test_GVector_LDADD = ../src/libgamma.la +#test_GVector_LDADD = ../src/libgamma.la +test_GVector_LDADD = ../src/libgamma.a test_GMatrix_SOURCES = test_GMatrix.cpp -test_GMatrix_LDADD = ../src/libgamma.la +#test_GMatrix_LDADD = ../src/libgamma.la +test_GMatrix_LDADD = ../src/libgamma.a test_GSymMatrix_SOURCES = test_GSymMatrix.cpp -test_GSymMatrix_LDADD = ../src/libgamma.la +#test_GSymMatrix_LDADD = ../src/libgamma.la +test_GSymMatrix_LDADD = ../src/libgamma.a test_GSparseMatrix_SOURCES = test_GSparseMatrix.cpp -test_GSparseMatrix_LDADD = ../src/libgamma.la +#test_GSparseMatrix_LDADD = ../src/libgamma.la +test_GSparseMatrix_LDADD = ../src/libgamma.a all: all-am .SUFFIXES: -- libgit2 0.21.4