[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freesci-develop] r1557 - in freesci/trunk: . src/tools
From: |
freesci |
Subject: |
[freesci-develop] r1557 - in freesci/trunk: . src/tools |
Date: |
Fri, 17 Feb 2006 14:08:13 +0100 |
Author: skovmanden
Date: 2006-02-17 14:08:11 +0100 (Fri, 17 Feb 2006)
New Revision: 1557
Modified:
freesci/trunk/configure.in
freesci/trunk/src/tools/Makefile.am
Log:
Made building of tools optional (use --with-tools if you want them).
Modified: freesci/trunk/configure.in
===================================================================
--- freesci/trunk/configure.in 2006-02-15 23:55:45 UTC (rev 1556)
+++ freesci/trunk/configure.in 2006-02-17 13:08:11 UTC (rev 1557)
@@ -4,7 +4,7 @@
AC_CANONICAL_TARGET([])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(freesci, 0.3.5)
+AM_INIT_AUTOMAKE(freesci, 0.3.5pre2)
AC_PROG_CC
#AC_LIBTOOL_DLOPEN
@@ -287,6 +287,11 @@
[AC_DEFINE(WANT_CONSOLE)],
[])
+AC_ARG_WITH(tools,
+ [ --with-tools Build freesci development tools],
+ [wanttools=yes],
+ [wanttools=no])
+
AC_ARG_WITH(forced-console,
[ --with-forced-console Enforce usage of on-screen console on all
gfx drivers],
[
@@ -321,6 +326,7 @@
esac
AM_CONDITIONAL(MORPHOS, test x$morphos = xyes)
+AM_CONDITIONAL(WANT_TOOLS, test x$wanttools = xyes)
AC_CONFIG_FILES([Makefile \
debian/Makefile \
@@ -328,7 +334,6 @@
doc/Makefile \
doc/misc/Makefile \
doc/man/Makefile \
- custom/Makefile \
conf/Makefile \
src/Makefile \
src/scicore/Makefile \
Modified: freesci/trunk/src/tools/Makefile.am
===================================================================
--- freesci/trunk/src/tools/Makefile.am 2006-02-15 23:55:45 UTC (rev 1556)
+++ freesci/trunk/src/tools/Makefile.am 2006-02-17 13:08:11 UTC (rev 1557)
@@ -1,6 +1,8 @@
INCLUDES = -I$(top_srcdir)/src/include @ac_png_includes@
LDADD = ../scicore/libscicore.a
EXTRA_DIST = sciunpack.h
+
+if WANT_TOOLS
bin_PROGRAMS = sciunpack sciconsole scidisasm scipack
sciunpack_SOURCES = sciunpack.c listwords.c scriptdump.c vocabdump.c
sciunpack_LDADD = ../sound/libscisound.a ../scicore/libscicore.a
@ac_glx_libraries@ @ac_glx_libraries@ @ac_png_libraries@
@@ -9,3 +11,4 @@
sciconsole_SOURCES = sciconsole.c
scipack_LDADD = ../scicore/libscicore.a
scipack_SOURCES = scipack.c
+endif
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freesci-develop] r1557 - in freesci/trunk: . src/tools,
freesci <=