[svn-upgrade] Integrating new upstream version, ion3 (20080103)

[ion3.git] / system.mk

diff --git a/system.mk b/system.mk
index 26ea7f76c9378023c9b6a56b7def16521a66cbbd..b592858f220ac613685ea089e3c206afcd488153 100644 (file)
--- a/system.mk
+++ b/system.mk
@@ -6,12 +6,10 @@
 ## Installation paths
 ##
 
+# Installation path prefix. Unless you know what you're doing, the default
+# of /usr/local is likely the correct choice.
 PREFIX=/usr/local
 
-# For relocatable build, use the following, and start with absolute path.
-# RELOCATABLE=1
-# PREFIX=
-
 # Unless you are creating a package conforming to some OS's standards, you
 # probably do not want to modify the following directories:
 
@@ -47,9 +45,11 @@ LOCALEDIR=$(PREFIX)/share/locale
 
 # Set PRELOAD_MODULES=1 if your system does not support dynamically loaded
 # modules through 'libdl' or has non-standard naming conventions.
+# You will likely need this option on e.g. Cygwin and Mac OS X.
 #PRELOAD_MODULES=1
 
-# Flags to link with libdl.
+# Flags to link with libdl. Even if PRELOAD_MODULES=1, you may need this
+# setting (for e.g. Lua, when not instructed by pkg-config).
 DL_LIBS=-ldl
 
 
@@ -77,6 +77,7 @@ LUAC=$(LUA_DIR)/bin/luac
 ## X libraries, includes and options
 ##
 
+# Paths
 X11_PREFIX=/usr/X11R6
 # SunOS/Solaris
 #X11_PREFIX=/usr/openwin
@@ -100,30 +101,46 @@ DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND
 
 
 ##
-## libc
+## Localisation
 ##
 
-# You may uncomment this if you know your system has
-# asprintf and vasprintf in the c library. (gnu libc has.)
-# If HAS_SYSTEM_ASPRINTF is not defined, an implementation
-# in sprintf_2.2/ is used.
-#HAS_SYSTEM_ASPRINTF=1
-
 # If you're on an archaic system (such as relatively recent *BSD releases)
 # without even dummy multibyte/widechar and localisation support, you may 
 # have to uncomment the following line:
 #DEFINES += -DCF_NO_LOCALE -DCF_NO_GETTEXT
 
-# On some other systems you may something like this:
+# On some other systems you may need to explicitly link against libintl.
 #EXTRA_LIBS += -lintl
-#EXTRA_INCLUDES +=
+# You may also need to give the location of its headers. The following
+# should work on Mac OS X (which needs the above option as well) with
+# macports.
+#EXTRA_INCLUDES += -I/opt/local/include
+
+
+##
+## libc
+##
+
+# You may uncomment this if you know that your system C libary provides
+# asprintf and  vasprintf. (GNU libc does.) If HAS_SYSTEM_ASPRINTF is not
+# defined, an implementation provided in libtu/sprintf_2.2/ is used. 
+#HAS_SYSTEM_ASPRINTF=1
 
-# clock_gettime for monotonic time
+# The following setting is needed with GNU libc for clock_gettime and the
+# monotonic clock. Other systems may not need it, or may not provide a
+# monotonic clock at all (which Ion can live with, and usually detect).
 EXTRA_LIBS += -lrt
 
 
+#
+# If you're using/have gcc, it is unlikely that you need to modify
+# any of the settings below this line.
+#
+#####################################################################
+
+
 ##
-## C compiler
+## C compiler. 
 ##
 
 CC=gcc
@@ -134,8 +151,8 @@ WARN=       -W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
        -Wtrigraphs -Wformat -Wchar-subscripts \
        -Wparentheses -pedantic -Wuninitialized
 
-CFLAGS=-Os $(WARN) $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
-LDFLAGS=-Os $(EXTRA_LIBS) $(LIBS)
+CFLAGS=-Os $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
+LDFLAGS=$(LIBS) $(EXTRA_LIBS)
 EXPORT_DYNAMIC=-Xlinker --export-dynamic
 
 # The following options are mainly for development use and can be used
@@ -167,9 +184,10 @@ EXPORT_DYNAMIC=-Xlinker --export-dynamic
 ##
 
 DEPEND_FILE=.depend
-DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(EXTRA_INCLUDES) $(INCLUDES)
+DO_MAKE_DEPEND=$(CC) -MM $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
 MAKE_DEPEND=$(DO_MAKE_DEPEND) $(SOURCES) > $(DEPEND_FILE)
 
+
 ##
 ## AR
 ##
@@ -184,11 +202,19 @@ RANLIB=ranlib
 ##
 
 INSTALL=sh $(TOPDIR)/install-sh -c
+INSTALL_STRIP=-s
 INSTALLDIR=mkdir -p
 
 BIN_MODE=755
 DATA_MODE=644
 
-STRIP=strip
-
 RM=rm
+
+
+##
+## Debugging
+##
+
+#INSTALL_STRIP =
+#CFLAGS += -g
+