ref: 426984e47b64dcd1ffa48ae922e05a3f4cef8d36
parent: 9b11b9e3e42c68070aba0f02a50da0d12aca4038
author: David Turner <[email protected]>
date: Fri Sep 15 19:47:42 EDT 2000
major revamp of the build system. Fixing the Unix Autoconf parts
--- a/builds/compiler/gcc-dev.mk
+++ b/builds/compiler/gcc-dev.mk
@@ -60,7 +60,7 @@
# Library linking
#
-ifndef
+ifndef CLEAN_LIBRARY
CLEAN_LIBRARY = $(DELETE) $(subst $(SEP),$(HOSTSEP),$(PROJECT_LIBRARY)) $(NO_OUTPUT)
endif
LINK_LIBRARY = $(AR) -r $@ $(OBJECTS_LIST)
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -81,6 +81,8 @@
$(RM) builds/unix/config.cache
$(RM) builds/unix/config.log
$(RM) builds/unix/config.status
+ $(RM) builds/unix/unix-def.mk
+ $(RM) builds/unix/unix-cc.mk
# IMPORTANT:
#
--- a/builds/unix/configure
+++ b/builds/unix/configure
@@ -955,7 +955,8 @@
else
case "$host" in
*-dec-osf*)
- XX_CFLAGS="-std1 -O2 -g3"
+ CFLAGS=
+ XX_CFLAGS="-std1 -g3"
XX_ANSIFLAGS=
;;
*)
@@ -970,7 +971,7 @@
# Extract the first word of "rm", so it can be a program name with args.
set dummy rm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:974: checking for $ac_word" >&5
+echo "configure:975: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RMF'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -999,7 +1000,7 @@
# Extract the first word of "rmdir", so it can be a program name with args.
set dummy rmdir; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1003: checking for $ac_word" >&5
+echo "configure:1004: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RMDIR'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1038,7 +1039,7 @@
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1042: checking for a BSD compatible install" >&5
+echo "configure:1043: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
@@ -1098,12 +1099,12 @@
esac
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1102: checking for ANSI C header files" >&5
+echo "configure:1103: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1107 "configure"
+#line 1108 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -1111,7 +1112,7 @@
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }+{ (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`if test -z "$ac_err"; then
rm -rf conftest*
@@ -1128,7 +1129,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1132 "configure"
+#line 1133 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -1146,7 +1147,7 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 1150 "configure"
+#line 1151 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1167,7 +1168,7 @@
:
else
cat > conftest.$ac_ext <<EOF
-#line 1171 "configure"
+#line 1172 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')@@ -1178,7 +1179,7 @@
exit (0); }
EOF
-if { (eval echo configure:1182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null+if { (eval echo configure:1183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/nullthen
:
else
@@ -1205,17 +1206,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1209: checking for $ac_hdr" >&5
+echo "configure:1210: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1214 "configure"
+#line 1215 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }+{ (eval echo configure:1220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`if test -z "$ac_err"; then
rm -rf conftest*
@@ -1243,12 +1244,12 @@
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1247: checking for working const" >&5
+echo "configure:1248: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
+#line 1253 "configure"
#include "confdefs.h"
int main() {@@ -1297,7 +1298,7 @@
; return 0; }
EOF
-if { (eval echo configure:1301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+if { (eval echo configure:1302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; thenrm -rf conftest*
ac_cv_c_const=yes
else
@@ -1318,7 +1319,7 @@
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:1322: checking size of int" >&5
+echo "configure:1323: checking size of int" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1326,7 +1327,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }else
cat > conftest.$ac_ext <<EOF
-#line 1330 "configure"
+#line 1331 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1337,7 +1338,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null+if { (eval echo configure:1342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/nullthen
ac_cv_sizeof_int=`cat conftestval`
else
@@ -1357,7 +1358,7 @@
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1361: checking size of long" >&5
+echo "configure:1362: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1365,7 +1366,7 @@
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }else
cat > conftest.$ac_ext <<EOF
-#line 1369 "configure"
+#line 1370 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
@@ -1376,7 +1377,7 @@
exit(0);
}
EOF
-if { (eval echo configure:1380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null+if { (eval echo configure:1381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/nullthen
ac_cv_sizeof_long=`cat conftestval`
else
@@ -1401,17 +1402,17 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1405: checking for $ac_hdr" >&5
+echo "configure:1406: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1410 "configure"
+#line 1411 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }+{ (eval echo configure:1416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`if test -z "$ac_err"; then
rm -rf conftest*
@@ -1440,12 +1441,12 @@
for ac_func in getpagesize
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1444: checking for $ac_func" >&5
+echo "configure:1445: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1450 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1468,7 +1469,7 @@
; return 0; }
EOF
-if { (eval echo configure:1472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; thenrm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1493,7 +1494,7 @@
done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:1497: checking for working mmap" >&5
+echo "configure:1498: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1501,7 +1502,7 @@
ac_cv_func_mmap_fixed_mapped=no
else
cat > conftest.$ac_ext <<EOF
-#line 1505 "configure"
+#line 1506 "configure"
#include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test.
@@ -1641,7 +1642,7 @@
}
EOF
-if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null+if { (eval echo configure:1646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/nullthen
ac_cv_func_mmap_fixed_mapped=yes
else
@@ -1669,12 +1670,12 @@
FTSYS_SRC='$(BUILD)/ftsystem.c'
echo $ac_n "checking whether munmap must be declared""... $ac_c" 1>&6
-echo "configure:1673: checking whether munmap must be declared" >&5
+echo "configure:1674: checking whether munmap must be declared" >&5
if eval "test \"`echo '$''{'ft_cv_munmap_decl'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1678 "configure"
+#line 1679 "configure"
#include "confdefs.h"
#ifdef HAVE_UNISTD_H
@@ -1685,7 +1686,7 @@
char *(*pfn) = (char *(*))munmap
; return 0; }
EOF
-if { (eval echo configure:1689: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+if { (eval echo configure:1690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; thenrm -rf conftest*
ft_cv_munmap_decl=no
else
@@ -1705,9 +1706,9 @@
fi
echo $ac_n "checking for munmap's first parameter type""... $ac_c" 1>&6
-echo "configure:1709: checking for munmap's first parameter type" >&5
+echo "configure:1710: checking for munmap's first parameter type" >&5
cat > conftest.$ac_ext <<EOF
-#line 1711 "configure"
+#line 1712 "configure"
#include "confdefs.h"
#include <unistd.h>
@@ -1717,7 +1718,7 @@
; return 0; }
EOF
-if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+if { (eval echo configure:1722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; thenrm -rf conftest*
echo "$ac_t""void *" 1>&6;cat >> confdefs.h <<\EOF
#define MUNMAP_USES_VOIDP 1
@@ -1737,12 +1738,12 @@
for ac_func in memcpy memmove
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1741: checking for $ac_func" >&5
+echo "configure:1742: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1746 "configure"
+#line 1747 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1765,7 +1766,7 @@
; return 0; }
EOF
-if { (eval echo configure:1769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; thenrm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1862,7 +1863,7 @@
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1866: checking for $ac_word" >&5
+echo "configure:1867: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1901,7 +1902,7 @@
if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1905: checking for ld used by GCC" >&5
+echo "configure:1906: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
@@ -1925,10 +1926,10 @@
esac
elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1929: checking for GNU ld" >&5
+echo "configure:1930: checking for GNU ld" >&5
else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1932: checking for non-GNU ld" >&5
+echo "configure:1933: checking for non-GNU ld" >&5
fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
@@ -1963,7 +1964,7 @@
fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1967: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1968: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -1979,7 +1980,7 @@
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1983: checking for BSD-compatible nm" >&5
+echo "configure:1984: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -2015,7 +2016,7 @@
echo "$ac_t""$NM" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:2019: checking whether ln -s works" >&5
+echo "configure:2020: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
@@ -2064,8 +2065,8 @@
case "$lt_target" in
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 2068 "configure"' > conftest.$ac_ext
- if { (eval echo configure:2069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then+ echo '#line 2069 "configure"' > conftest.$ac_ext
+ if { (eval echo configure:2070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; thencase "`/usr/bin/file conftest.o`" in
*32-bit*)
LD="${LD-ld} -32"@@ -2086,12 +2087,12 @@
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:2090: checking whether the C compiler needs -belf" >&5
+echo "configure:2091: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; thenecho $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2095 "configure"
+#line 2096 "configure"
#include "confdefs.h"
int main() {@@ -2098,7 +2099,7 @@
; return 0; }
EOF
-if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then+if { (eval echo configure:2103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; thenrm -rf conftest*
lt_cv_cc_needs_belf=yes
else
@@ -2301,7 +2302,7 @@
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "unix.mk:unix.in ftconfig.h:ftconfig.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in ftconfig.h:ftconfig.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -2403,7 +2404,7 @@
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"unix.mk:unix.in"}+CONFIG_FILES=\${CONFIG_FILES-"unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in"}EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -2580,6 +2581,5 @@
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1-
--- a/builds/unix/configure.in
+++ b/builds/unix/configure.in
@@ -79,10 +79,9 @@
AM_PROG_LIBTOOL
-dnl create the Unix-specific sub-Makefile `builds/unix/unix.mk' that will be
-dnl used by the build system
+dnl create the Unix-specific sub-Makefile `builds/unix/unix-def.mk'
+dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
dnl
-AC_OUTPUT(unix-def.mk:unix-def.in)
-AC_OUTPUT(unix-cc.mk:unix-cc.in)
+AC_OUTPUT(unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in)
dnl end of configure.in
--- a/builds/unix/detect.mk
+++ b/builds/unix/detect.mk
@@ -43,13 +43,13 @@
# directory (e.g. solaris.mk + changes here to detect the platform).
#
CONFIG_FILE := unix.mk
- setup: unix.mk
+ setup: unix-def.mk
unix: setup
endif
setup: std_setup
- unix.mk: builds/unix/unix.in
+ unix-def.mk: builds/unix/unix-def.in
cd builds/unix; $(USE_CFLAGS) ./configure $(CFG)
endif # test Unix
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -24,7 +24,9 @@
done
uninstall:
- -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(LIBRARY).$A
+ -$(LIBTOOL) --mode=uninstall $(RM) $(libdir)/$(PROJECT_LIBRARY).$A
+ -$(DELETE) $(includedir)/freetype/cache/*
+ -$(DELDIR) $(includedir)/freetype/cache
-$(DELETE) $(includedir)/freetype/config/*
-$(DELDIR) $(includedir)/freetype/config
-$(DELETE) $(includedir)/freetype/internal/*
@@ -45,8 +47,6 @@
-$(DELETE) $(OBJ_DIR)/.libs/*
-$(DELDIR) $(OBJ_DIR)/.libs
-$(DELETE) *.orig *~ core *.core $(DISTCLEAN)
-
-endif
--- a/builds/unix/unix-def.in
+++ b/builds/unix/unix-def.in
@@ -36,7 +36,8 @@
DISTCLEAN += $(BUILD)/config.cache \
$(BUILD)/config.log \
$(BUILD)/config.status \
- $(BUILD)/unix.mk \
+ $(BUILD)/unix-def.mk \
+ $(BUILD)/unix-cc.mk \
$(BUILD)/ftconfig.h \
$(LIBTOOL)
@@ -74,31 +75,9 @@
LIB_DIR := $(OBJ_DIR)
-ifdef BUILD_PROJECT
-
- # Now include the main sub-makefile. It contains all the rules used to
- # build the library with the previous variables defined.
- #
- include $(TOP)/builds/$(PROJECT).mk
-
-
- # The cleanup targets.
- #
- clean_project: clean_project_unix
- distclean_project: distclean_project_unix
-
-
- # This final rule is used to link all object files into a single library.
- # It is part of the system-specific sub-Makefile because not all
- # librarians accept a simple syntax like
- #
- # librarian library_file {list of object files} - #
- $(PROJECT_LIBRARY): $(OBJECTS_LIST)
-ifdef CLEAN_LIBRARY
- -$(CLEAN_LIBRARY) $(NO_OUTPUT)
-endif
- $(LINK_LIBRARY)
-
+# the NO_OUTPUT macro is appended to command lines in order to ignore
+# the output of some programs..
+#
+NO_OUTPUT := 2> /dev/null
# EOF
--- a/builds/unix/unix.mk
+++ b/builds/unix/unix.mk
@@ -1,8 +1,33 @@
-#
-# Unix specific configuration definitions
-#
include $(TOP)/builds/unix/unix-def.mk
include $(TOP)/builds/unix/unix-cc.mk
+
+ifdef BUILD_PROJECT
+
+ # Now include the main sub-makefile. It contains all the rules used to
+ # build the library with the previous variables defined.
+ #
+ include $(TOP)/builds/$(PROJECT).mk
+
+
+ # The cleanup targets.
+ #
+ clean_project: clean_project_unix
+ distclean_project: distclean_project_unix
+
+
+ # This final rule is used to link all object files into a single library.
+ # It is part of the system-specific sub-Makefile because not all
+ # librarians accept a simple syntax like
+ #
+ # librarian library_file {list of object files} + #
+ $(PROJECT_LIBRARY): $(OBJECTS_LIST)
+ifdef CLEAN_LIBRARY
+ -$(CLEAN_LIBRARY) $(NO_OUTPUT)
+endif
+ $(LINK_LIBRARY)
+
+endif
+
include $(TOP)/builds/unix/install.mk
-# EOF
--- a/builds/unix/unixddef.mk
+++ b/builds/unix/unixddef.mk
@@ -23,10 +23,6 @@
BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
PLATFORM := unixdev # do not set it to 'unix', or libtool will trick you
-# don't use `:=' here since the path stuff will be included after this file
-#
-FTSYS_SRC = @FTSYS_SRC@
-
# The directory where all object files are placed.
#
OBJ_DIR := obj
@@ -40,6 +36,6 @@
LIB_DIR := $(OBJ_DIR)
#
-NO_OUTPUT := 2> /dev/nul
+NO_OUTPUT := 2> /dev/null
# EOF