Changeset 2103:a979fcdda073 in lemon-0.x

Timestamp:

06/21/06 10:35:23 (18 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2794

Message:

Exclude the gui from the build.

Files:

• Makefile.am (modified) (5 diffs)
• bootstrap (modified) (1 diff)
• configure.ac (modified) (4 diffs)
• m4/Makefile.am (deleted)

Makefile.am

@@ -2 +2 @@
 
 EXTRA_DIST = \
-        build-aux/config.rpath \
-        build-aux/mkinstalldirs \
         LICENSE \
-        ABOUT-NLS \
         lemon.spec \
         autopackage/default.apspec.in \
@@ -14 +11 @@
   MAYBE_DOC = doc
 endif
-if WANT_GUI
-  MAYBE_GUI = gui
-endif
 if WANT_DEMO
   MAYBE_DEMO = demo
@@ -24 +18 @@
 endif
 
-SUBDIRS = lemon po m4 $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
+SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_DOC) test
 
 MRPROPERFILES = \
@@ -38 +32 @@
         build-aux/ltmain.sh \
         build-aux/missing \
-        build-aux/mkinstalldirs \
-        build-aux/config.rpath \
         doc/Makefile.in \
         doc/doxygen.log \
@@ -46 +38 @@
         test/Makefile.in \
         benchmark/Makefile.in \
-        demo/Makefile.in \
-        gui/icons/Makefile.in \
-        gui/Makefile.in \
-        ABOUT-NLS \
-        m4/Makefile.in \
-        m4/lib-link.m4 \
-        m4/printf-posix.m4 \
-        m4/uintmax_t.m4 \
-        m4/signed.m4 \
-        m4/iconv.m4 \
-        m4/inttypes.m4 \
-        m4/longlong.m4 \
-        m4/glibc21.m4 \
-        m4/inttypes_h.m4 \
-        m4/codeset.m4 \
-        m4/longdouble.m4 \
-        m4/nls.m4 \
-        m4/intmax.m4 \
-        m4/lib-prefix.m4 \
-        m4/glibc2.m4 \
-        m4/xsize.m4 \
-        m4/lcmessage.m4 \
-        m4/lib-ld.m4 \
-        m4/ulonglong.m4 \
-        m4/wint_t.m4 \
-        m4/progtest.m4 \
-        m4/inttypes-pri.m4 \
-        m4/stdint_h.m4 \
-        m4/intdiv0.m4 \
-        m4/isc-posix.m4 \
-        m4/po.m4 \
-        m4/size_max.m4 \
-        m4/gettext.m4 \
-        m4/wchar_t.m4 \
-        po/Rules-quot \
-        po/en@quot.header \
-        po/insert-header.sin \
-        po/quot.sed \
-        po/en@boldquot.header \
-        po/boldquot.sed \
-        po/Makevars.template \
-        po/remove-potcdate.sin \
-        po/Makefile.in.in
+        demo/Makefile.in
 
 doc-clean:

bootstrap

@@ -76 +76 @@
 fi
 
-quiet || echo "Try using 'autoreconf -vi' instead of this."
-
 set -e
 quiet || set -x
 
-autopoint
 $aclocal -I m4
 (quiet && exec > /dev/null; libtoolize --force --copy)

configure.ac

@@ -17 +17 @@
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
-
-dnl i18n
-AM_GNU_GETTEXT_VERSION([0.14.2])
-AM_GNU_GETTEXT([external])
 
 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
@@ -58 +54 @@
 AC_SUBST(DOXYGEN_INTERNAL_DOCS)
 AM_CONDITIONAL([WANT_DOC], [test x"$enable_doc" != x"no"])
-
-dnl Disable/enable building the GUI
-AC_ARG_ENABLE([gui],
-AS_HELP_STRING([--enable-gui], [build the GUI])
-AS_HELP_STRING([--disable-gui], [do not build the GUI @<:@default@:>@]),
-              [], [enable_gui=no])
-AC_MSG_CHECKING([whether to build the GUI])
-if test x"$enable_gui" != x"no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-if test x"$enable_gui" != x"no"; then
-  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0 gtkmm-2.4 >= 2.6])
-fi
-AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
 
 dnl Disable/enable building the demo programs
@@ -126 +106 @@
 demo/Makefile
 test/Makefile
-gui/Makefile
-po/Makefile.in
-m4/Makefile
 ])
 
@@ -146 +123 @@
 echo build benchmarks.............. : $enable_benchmark
 echo build demo programs........... : $enable_demo
-echo build GUI..................... : $enable_gui
 echo
 echo The packace will be installed in