Changeset 451f17


Ignore:
Timestamp:
May 10, 2011, 12:31:03 PM (14 years ago)
Author:
Frederik Heber <heber@…>
Children:
74e0f7
Parents:
76379c
git-author:
Frederik Heber <heber@…> (05/10/11 11:58:26)
git-committer:
Frederik Heber <heber@…> (05/10/11 12:31:03)
Message:

Fixing distcheck and some errors from boost.m4 switch-over.

  • all .m4 files are listed under EXTRA_DIST.
  • ax_codepatterns.m4 now requires BOOST_THREADS by Tsuna's boost.m4.
  • fixed some wrong shell variables with boost.m4' change: LIB -> LIBS
  • added so far missing cppunit.m4 to repository.
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

    r76379c r451f17  
    44AUTOMAKE_OPTIONS = subdir-objects
    55
    6 EXTRA_DIST = bootstrap
     6EXTRA_DIST = \
     7        bootstrap \
     8        m4/ac_doxygen.m4 \
     9        m4/ax_codepatterns.m4 \
     10        m4/boost.m4 \
     11        m4/cppunit.m4
    712
    813.PHONY: doc

  • m4/ax_codepatterns.m4

    r76379c r451f17  
    55AC_DEFUN([AM_PATH_CODEPATTERNS],
    66[
    7 AC_REQUIRE([AX_BOOST_THREAD])
     7AC_REQUIRE([BOOST_THREADS])
    88
    99AC_ARG_WITH(codepatterns,[  --with-codepatterns=PFX   Prefix where CodePatterns is installed (optional)],

  • src/Makefile.am

    r76379c r451f17  
    44INCLUDES = -I$(top_srcdir)/src/Patterns -I$(top_srcdir)/src/Helpers
    55
    6 AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS) 
     6AM_LDFLAGS = $(CPPUNIT_LIBS) -ldl $(BOOST_THREAD_LDFLAGS)
    77AM_CPPFLAGS = ${BOOST_CPPFLAGS} $(CPPUNIT_CFLAGS)
    88
    … …  
    9090##-@CODEPATTERNS_API_VERSION@
    9191lib_LTLIBRARIES = libCodePatterns.la libCodePatterns-debug.la
    92 libCodePatterns_LIBS = $(BOOST_THREAD_LIB)
    93 libCodePatterns_debug_LIBS = $(BOOST_THREAD_LIB)
     92libCodePatterns_la_LIBADD = $(BOOST_THREAD_LIBS)
     93libCodePatterns_debug_la_LIBADD = $(BOOST_THREAD_LIBS)
    9494
    9595libCodePatterns_la_CPPFLAGS = -DNDEBUG -DNO_MEMDEBUG $(AM_CPPFLAGS)
    … …  
    112112## that all version information is kept in one place.
    113113#-$(CODEPATTERNS_API_VERSION)
    114 libCodePatterns_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
    115 libCodePatterns_debug_la_LDFLAGS = -version-info $(CODEPATTERNS_SO_VERSION)
     114libCodePatterns_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CODEPATTERNS_SO_VERSION)
     115libCodePatterns_debug_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(CODEPATTERNS_SO_VERSION)
    116116
    117117## The generated configuration header is installed in its own subdirectory of
Note: See TracChangeset for help on using the changeset viewer.