From a6715bfa92523b628b5d1c05b2d82ecdc1f5a1a4 Mon Sep 17 00:00:00 2001 From: jjgarcia Date: Mon, 8 Dec 2003 09:41:29 +0000 Subject: [PATCH] Split the compiler flags into CFLAGS (used only when building ECL) and ECL_CFLAGS (exported into ecl-config). Set the value of SHELL explicitely in the makefiles so that they work when SHELL=/bin/csh in the environment. --- Makefile.in | 5 ----- src/CHANGELOG | 6 ++++++ src/Makefile.in | 4 ++-- src/aclocal.m4 | 2 +- src/c/Makefile.in | 4 ++-- src/compile.lsp.in | 2 +- src/configure | 6 +++--- src/configure.in | 2 +- src/doc/Makefile.in | 3 ++- src/util/ecl-config | 2 +- 10 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Makefile.in b/Makefile.in index 38295cd4b..0661c3763 100644 --- a/Makefile.in +++ b/Makefile.in @@ -37,11 +37,6 @@ WWW=http://ecls.sourceforge.net/ # ==================== Things `configure' Might Edit ==================== -CC=@CC@ -CPP=@CPP@ -LN_S=@LN_S@ -CFLAGS=@CFLAGS@ - # Where to find the source code. # This is set by the configure script's `--srcdir' option. srcdir=@srcdir@ diff --git a/src/CHANGELOG b/src/CHANGELOG index ec2b5aaac..f7f2d0142 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1732,6 +1732,8 @@ ECL 0.9d - The configuration process now does respect the values of libdir, bindir, infodir,... supplied by the user. + - SLOT-EXISTS-P now works with all types of objects. + * Documentation: - New manual page documents the scripting facilities of ECL @@ -1759,6 +1761,10 @@ ECL 0.9d instead of the old form "make PREFIX=...". ECL now follows the GNU coding standards in this particular point. + - The script "ecl-config" now returns only the essential flags to compile a + file that links against ECL. It does not include optimization flags, or + flags to create position independent object files. + TODO: ===== diff --git a/src/Makefile.in b/src/Makefile.in index 3cfb9f504..428a68b94 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ CC = @ECL_CC@ LIBS = @LIBS@ @TKLIBS@ @CLIBS@ -CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ RM = @RM@ EXE = @EXEEXT@ @@ -27,10 +26,11 @@ libdir=@libdir@ # Programs used by "make install": # +SHELL = @SHELL@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -mkinstalldirs = $(SHELL) -c $(top_srcdir)/gc/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs # Files diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 2bb866faf..48750edaf 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -204,7 +204,7 @@ case "${host_os}" in shared="no" ;; esac -CFLAGS="${CFLAGS} -D${thehost}" +ECL_CFLAGS="-D${thehost}" AC_MSG_CHECKING(for ld flags when building shared libraries) if test "${shared}" = "yes"; then AC_MSG_RESULT([${SHARED_LDFLAGS}]) diff --git a/src/c/Makefile.in b/src/c/Makefile.in index b46924328..00c7ece4b 100644 --- a/src/c/Makefile.in +++ b/src/c/Makefile.in @@ -9,7 +9,7 @@ VPATH = @srcdir@ # TRUE_CC = @CC@ CC = @ECL_CC@ -CFLAGS = -c -I../h -I$(srcdir) -I$(HDIR) @BOEHM_HEADERS@ @CFLAGS@ +CFLAGS = -c -I../h -I$(srcdir) -I$(HDIR) @BOEHM_HEADERS@ @CFLAGS@ @ECL_CFLAGS@ SHELL = /bin/sh RM = @RM@ @@ -82,7 +82,7 @@ clean: $(DPP): $(srcdir)/dpp.c symbols_list2.h if test -f ../CROSS-DPP; then touch dpp; else \ - $(TRUE_CC) @CFLAGS@ -I../h -I./ -I$(HDIR) $(DEFS) $(srcdir)/dpp.c -o $@ ; \ + $(TRUE_CC) @CFLAGS@ @ECL_CFLAGS@ -I../h -I./ -I$(HDIR) $(DEFS) $(srcdir)/dpp.c -o $@ ; \ fi symbols_list2.h: $(srcdir)/symbols_list.h Makefile cat $(srcdir)/symbols_list.h | \ diff --git a/src/compile.lsp.in b/src/compile.lsp.in index 4c2f103ac..68e154ef2 100644 --- a/src/compile.lsp.in +++ b/src/compile.lsp.in @@ -34,7 +34,7 @@ ;;; with an already installed copy of ECL. ;;; (setq c::*cc-flags* - "@CFLAGS@ @LSPCFLAGS@ -I@true_srcdir@/h -I@true_srcdir@/gmp -I@true_builddir@/h" + "@CFLAGS@ @ECL_CFLAGS@ -I@true_srcdir@/h -I@true_srcdir@/gmp -I@true_builddir@/h" c::*cc-format* "~A ~A ~:[~*~;~A~] -I@true_builddir@/h~* -w -c ~A -o ~A" c::*ld-format* diff --git a/src/configure b/src/configure index ac8ab4019..c22d6b094 100755 --- a/src/configure +++ b/src/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC LSPCFLAGS CLIBS SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -3932,7 +3932,7 @@ case "${host_os}" in shared="no" ;; esac -CFLAGS="${CFLAGS} -D${thehost}" +ECL_CFLAGS="-D${thehost}" echo "$as_me:$LINENO: checking for ld flags when building shared libraries" >&5 echo $ECHO_N "checking for ld flags when building shared libraries... $ECHO_C" >&6 if test "${shared}" = "yes"; then @@ -6685,7 +6685,7 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@LN_S@,$LN_S,;t t s,@ECL_CC@,$ECL_CC,;t t -s,@LSPCFLAGS@,$LSPCFLAGS,;t t +s,@ECL_CFLAGS@,$ECL_CFLAGS,;t t s,@CLIBS@,$CLIBS,;t t s,@SHARED_LDFLAGS@,$SHARED_LDFLAGS,;t t s,@BUNDLE_LDFLAGS@,$BUNDLE_LDFLAGS,;t t diff --git a/src/configure.in b/src/configure.in index 6bcfbc594..2d0f6eebe 100644 --- a/src/configure.in +++ b/src/configure.in @@ -115,7 +115,7 @@ AC_PROG_LN_S # sets variable LN_S AC_EXEEXT dnl Guess whether .exe is needed for executables AC_SUBST(ECL_CC)dnl Which compiler should we use for building ECL AC_SUBST(CFLAGS)dnl Flags for the compiler -AC_SUBST(LSPCFLAGS)dnl Additional flags needed to compile translated code +AC_SUBST(ECL_CFLAGS)dnl Similar, but specific to ECL (see src/util/ecl-config) AC_SUBST(CLIBS)dnl System libraries to be linked in AC_SUBST(LDFLAGS)dnl Flags for program linker AC_SUBST(SHARED_LDFLAGS)dnl Flags for shared libraries linker diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in index ad0e414c5..1763f27e1 100644 --- a/src/doc/Makefile.in +++ b/src/doc/Makefile.in @@ -7,10 +7,11 @@ infodir = @infodir@ mandir=@mandir@ manext=1 +SHELL = @SHELL@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -mkinstalldirs = $(SHELL) -c $(top_srcdir)/gc/mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs VERSION=@ECL_VERSION@ diff --git a/src/util/ecl-config b/src/util/ecl-config index 0f2b2c912..32116a45e 100644 --- a/src/util/ecl-config +++ b/src/util/ecl-config @@ -31,7 +31,7 @@ for i in $*; do done if test "$echo_cflags" = "yes"; then - echo "@CFLAGS@ -I@includedir\@" + echo "@ECL_CFLAGS@ -I@includedir\@" fi if test "$echo_ldflags" = "yes"; then