diff options
| author | Arch Librarian <arch@canonical.com> | 2004-09-20 16:50:48 +0000 |
|---|---|---|
| committer | Arch Librarian <arch@canonical.com> | 2004-09-20 16:50:48 +0000 |
| commit | 118a5e95e00908ec20759a240416c3775fddbf57 (patch) | |
| tree | b1245d80a73581fa3225f14a569a8707fd4be7ec /buildlib | |
| parent | d7bccc73c61de8be73c71c4447b9a007ffb80834 (diff) | |
| download | apt-118a5e95e00908ec20759a240416c3775fddbf57.tar.gz | |
New make changes
Author: jgg
Date: 1998-07-14 03:31:31 GMT
New make changes
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/config.h.in | 12 | ||||
| -rw-r--r-- | buildlib/defaults.mak | 27 |
2 files changed, 25 insertions, 14 deletions
diff --git a/buildlib/config.h.in b/buildlib/config.h.in index 4df268022..386d7a619 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -4,9 +4,6 @@ byte first (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN -/* Define if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - /* The number of bytes in a unsigned char. */ #undef SIZEOF_UNSIGNED_CHAR @@ -18,3 +15,12 @@ /* The number of bytes in a unsigned short. */ #undef SIZEOF_UNSIGNED_SHORT + +/* Define if we have libgpm. */ +#undef HAVE_LIBGPM + +/* Define if we have the SLang library from Davis. */ +#undef HAVE_LIBSLANG + +/* Define if we have the X11 windowing system. */ +#undef HAVE_X11 diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index 50f27de5a..adbaf2758 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -26,9 +26,21 @@ # but by explicly setting the BUILD variable. Make is invoked from # within the source itself which is much more compatible with compilation # environments. +.SILENT: -ifndef BUILD -BUILD=$(BASE)/build +# Search for the build directory +ifdef BUILD +BUILD_POSSIBLE = $(BUILD) +else +BUILD_POSSIBLE = $(BASE) $(BASE)/build +endif + +BUILD:= $(foreach i,$(BUILD_POSSIBLE),$(wildcard $(i)/environment.mak)) +BUILD:= $(firstword $(dir $(BUILD))) + +ifeq ($(words $(BUILD)),0) +error-all: + echo Can't find the build directory in $(BUILD_POSSIBLE) -- use BUILD= endif # Base definitions @@ -57,15 +69,8 @@ SUBDIRS+= HEADER_TARGETDIRS+= # Options -CXX = c++ -CC = cc -CPPFLAGS+= -I$(INCLUDE) -CXXFLAGS+= -Wall -g -fno-implicit-templates -fno-exceptions -PICFLAGS+= -fPIC -DPIC -LFLAGS+= -INLINEDEPFLAG = -MD -DEBIANDOC_HTML = yes -DEBIANDOC_TEXT = yes +include $(BUILD)/environment.mak +CPPFLAGS+= -I$(BUILD)/include # Phony rules. Other things hook these by appending to the dependency # list |