nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

build: switch from LT libraries to pure static

Browse Source 
We only ever supported static libraries, and this greatly simplifies
argument management compiling/linking for MinGW
This commit is contained in:
Danny Robson 2014-12-10 13:51:54 +11:00
parent b56426ff16
commit de353c9297
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@ -4,7 +4,6 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(ZLIB_CFLAGS) AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(ZLIB_CFLAGS)
AM_LDFLAGS = $(BOOST_LDFLAGS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)
SUBDIRS = test SUBDIRS = test
@ -182,18 +181,22 @@ SUFFIXES = .cpp .cpp.rl
############################################################################### ###############################################################################
## Library definition ## Library definition
lib_LTLIBRARIES = libutil.la lib_LIBRARIES = libutil.a
libutil_la_SOURCES = $(UTIL_FILES) libutil_a_SOURCES = $(UTIL_FILES)
libutil_la_CXXFLAGS = $(AM_CXXFLAGS) libutil_a_CXXFLAGS = $(AM_CXXFLAGS)
libutil_la_LIBADD = $(BOOST_SYSTEM_LIB)
############################################################################### ###############################################################################
## Utility programs ## Utility programs
AM_DEFAULT_SOURCE_EXT = .cpp AM_DEFAULT_SOURCE_EXT = .cpp
LDADD = $(top_builddir)/libutil.la
AM_LDFLAGS = $(BOOST_LDFLAGS)
LDADD = $(top_builddir)/libutil.a $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)
bin_PROGRAMS = \ bin_PROGRAMS = \
tools/hash \ tools/hash \
tools/json-clean \ tools/json-clean \
tools/json-validate \ tools/json-validate \
tools/json-schema tools/json-schema
tools_hash_LDADD = $(top_builddir)/libutil.a $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) $(ZLIB_LIBS)

4
configure.ac
View File

@ -14,14 +14,14 @@ AC_CONFIG_MACRO_DIR([m4])
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS
AC_CANONICAL_HOST AC_CANONICAL_HOST
LT_INIT
AC_LANG([C++]) AC_LANG([C++])
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CXXCPP AC_PROG_CXXCPP
AC_PROG_RANLIB
AX_CXX_COMPILE_STDCXX_11([noext]) AX_CXX_COMPILE_STDCXX_11([noext])
LT_INIT
AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz foreign subdir-objects]) AM_INIT_AUTOMAKE([1.14 dist-bzip2 dist-xz foreign subdir-objects])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])