COIN-OR::LEMON - Graph Library

Changeset 2043:54f80cf6ac86 in lemon-0.x


Ignore:
Timestamp:
04/12/06 22:38:22 (14 years ago)
Author:
Akos Ladanyi
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2682
Message:

revert to single configure scheme

Files:
5 added
8 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r2012 r2043  
    2121endif
    2222
    23 SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
     23SUBDIRS = lemon po $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
    2424
    2525MRPROPERFILES = \
     
    3636        build-aux/missing \
    3737        build-aux/mkinstalldirs \
     38        build-aux/config.rpath \
    3839        doc/Makefile.in \
    3940        doc/doxygen.log \
     
    4445        demo/Makefile.in \
    4546        gui/icons/Makefile.in \
    46         gui/Makefile.in
     47        gui/Makefile.in \
     48        ABOUT-NLS \
     49        m4/lib-link.m4 \
     50        m4/printf-posix.m4 \
     51        m4/uintmax_t.m4 \
     52        m4/signed.m4 \
     53        m4/iconv.m4 \
     54        m4/inttypes.m4 \
     55        m4/longlong.m4 \
     56        m4/glibc21.m4 \
     57        m4/inttypes_h.m4 \
     58        m4/codeset.m4 \
     59        m4/longdouble.m4 \
     60        m4/nls.m4 \
     61        m4/intmax.m4 \
     62        m4/lib-prefix.m4 \
     63        m4/glibc2.m4 \
     64        m4/xsize.m4 \
     65        m4/lcmessage.m4 \
     66        m4/lib-ld.m4 \
     67        m4/ulonglong.m4 \
     68        m4/wint_t.m4 \
     69        m4/progtest.m4 \
     70        m4/inttypes-pri.m4 \
     71        m4/stdint_h.m4 \
     72        m4/intdiv0.m4 \
     73        m4/isc-posix.m4 \
     74        m4/po.m4 \
     75        m4/size_max.m4 \
     76        m4/gettext.m4 \
     77        m4/wchar_t.m4 \
     78        po/Rules-quot \
     79        po/en@quot.header \
     80        po/insert-header.sin \
     81        po/quot.sed \
     82        po/en@boldquot.header \
     83        po/boldquot.sed \
     84        po/Makevars.template \
     85        po/remove-potcdate.sin \
     86        po/Makefile.in.in
    4787
    4888doc-clean:
  • bootstrap

    r2015 r2043  
    8181quiet || set -x
    8282
     83autopoint
    8384$aclocal -I m4
    8485(quiet && exec > /dev/null; libtoolize --force --copy)
  • configure.ac

    r2012 r2043  
    1717AC_DISABLE_SHARED
    1818AC_PROG_LIBTOOL
     19
     20dnl i18n
     21AM_GNU_GETTEXT_VERSION([0.14.5])
     22AM_GNU_GETTEXT([external])
    1923
    2024if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
     
    6771fi
    6872if test x"$enable_gui" != x"no"; then
    69   AC_CONFIG_SUBDIRS([gui])
     73  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
    7074fi
    7175AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
     
    100104AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
    101105
    102 dnl Checks for header files.
    103 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
    104 
    105106dnl Checks for typedefs, structures, and compiler characteristics.
    106107AC_C_CONST
     
    125126demo/Makefile
    126127test/Makefile
     128gui/Makefile
     129po/Makefile.in
    127130])
    128131
  • gui/Makefile.am

    r2012 r2043  
    11AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
    2 LDADD = ../lemon/libemon.la
    3 
    4 ACLOCAL_AMFLAGS = -I m4
    5 
    6 EXTRA_DIST = \
    7         build-aux/config.rpath
    8 
    9 SUBDIRS = po
     2LDADD = $(top_builddir)/lemon/libemon.la
    103
    114bin_PROGRAMS = glemon
     
    5245glemon_CXXFLAGS = $(GTK_CFLAGS)
    5346glemon_LDFLAGS = $(GTK_LIBS)
    54 #glemon_LDADD = $(LIBINTL)
     47glemon_LDADD = $(LIBINTL)
    5548
    5649IMAGES = \
     
    7770        ( rm -f guipixbufs.h && false )
    7871
    79 EXTRA_DIST += $(IMAGES) guipixbufs.h
    80 
    81 MRPROPERFILES = \
    82         aclocal.m4 \
    83         config.h.in \
    84         config.h.in~ \
    85         configure \
    86         Makefile.in \
    87         build-aux/config.guess \
    88         build-aux/config.rpath \
    89         build-aux/config.sub \
    90         build-aux/depcomp \
    91         build-aux/install-sh \
    92         build-aux/ltmain.sh \
    93         build-aux/missing \
    94         build-aux/mkinstalldirs \
    95         Makefile.in \
    96         m4/intmax.m4 \
    97         m4/lib-link.m4 \
    98         m4/lib-prefix.m4 \
    99         m4/printf-posix.m4 \
    100         m4/xsize.m4 \
    101         m4/glibc2.m4 \
    102         m4/lib-ld.m4 \
    103         m4/lcmessage.m4 \
    104         m4/wint_t.m4 \
    105         m4/ulonglong.m4 \
    106         m4/inttypes-pri.m4 \
    107         m4/progtest.m4 \
    108         m4/uintmax_t.m4 \
    109         m4/signed.m4 \
    110         m4/stdint_h.m4 \
    111         m4/intdiv0.m4 \
    112         m4/iconv.m4 \
    113         m4/po.m4 \
    114         m4/isc-posix.m4 \
    115         m4/longlong.m4 \
    116         m4/inttypes.m4 \
    117         m4/size_max.m4 \
    118         m4/glibc21.m4 \
    119         m4/gettext.m4 \
    120         m4/codeset.m4 \
    121         m4/inttypes_h.m4 \
    122         m4/wchar_t.m4 \
    123         m4/longdouble.m4 \
    124         m4/nls.m4 \
    125         po/Rules-quot \
    126         po/en@quot.header \
    127         po/insert-header.sin \
    128         po/quot.sed \
    129         po/en@boldquot.header \
    130         po/boldquot.sed \
    131         po/Makevars.template \
    132         po/remove-potcdate.sin \
    133         po/Makefile.in.in
    134 
    135 mrproper:
    136         $(MAKE) $(AM_MAKEFLAGS) maintainer-clean
    137         -rm -f $(MRPROPERFILES)
    138 
    139 .PHONY: mrproper
     72EXTRA_DIST = $(IMAGES) guipixbufs.h
Note: See TracChangeset for help on using the changeset viewer.