* debugger/mcs51/sdcdb.c: replaced SDCC_LIB_DIR
* configure.in: removed sdcc_datadir, sdcc_lib_dir and sdcc_include_dir
* configure: rebuilt from configure.in
* sdccconf_in.h: removed SDCC_LIB_DIR and SDCC_INCLUDE_DIR
* sdcc_vc_in.h: removed SDCC_LIB_DIR and SDCC_INCLUDE_DIR
* device/include/Makefile.in: replaced sdcc_datadir
* device/lib/Makefile.in: replaced sdcc_datadir
* Makefile.common.in: added LDFLAGS from configure
* support/cpp2/Makefile.in: added LDFLAGS from configure
* packihx/Makefile.in: use LDFLAGS
* src/Makefile.in: use LDFLAGS
* support/makebin/Makefile: use LDFLAGS
* .version: bumped version number to 2.3.5
git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@2520
4a8a32a2-be11-0410-ad9d-
d568d2c75423
+2003-04-12 Bernhard Held <bernhard@bernhardheld.de>
+
+ * src/SDCCutil.c (pathEquivalent): defined but not used
+ * debugger/mcs51/sdcdb.c: replace SDCC_LIB_DIR
+ * configure.in: remove sdcc_datadir, sdcc_lib_dir and sdcc_include_dir
+ * configure: rebuilt from configure.in
+ * sdccconf_in.h: remove SDCC_LIB_DIR and SDCC_INCLUDE_DIR
+ * sdcc_vc_in.h: remove SDCC_LIB_DIR and SDCC_INCLUDE_DIR
+ * device/include/Makefile.in: replace sdcc_datadir
+ * device/lib/Makefile.in: replace sdcc_datadir
+ * Makefile.common.in: add LDFLAGS from configure
+ * packihx/Makefile.in: use LDFLAGS
+ * src/Makefile.in: use LDFLAGS
+ * support/cpp2/Makefile.in: add LDFLAGS from configure
+ * support/makebin/Makefile: use LDFLAGS
+ * .version: bumped version number to 2.3.5
+
2003-04-12 Borut Razem <borut.razem@siol.net>
* completed "different paths" task:
DEFS = $(subs -DHAVE_CONFIG_H,,@DEFS@)
CPPFLAGS = $(INCLUDEFLAGS) -I. -I$(PRJDIR) -I$(SLIB)
CFLAGS = -Wall @CFLAGS@
+LDFLAGS = @LDFLAGS@
M_OR_MM = @M_OR_MM@
EXTRALIBS = @LIBS@
ac_subdirs_all="$ac_subdirs_all support/cpp2"
ac_subdirs_all="$ac_subdirs_all packihx"
ac_subdirs_all="$ac_subdirs_all sim/ucsim"
-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 AWK VERSION VERSIONHI VERSIONLO VERSIONP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC AUTOCONF STRIP AS CP LYX LATEX LATEX2HTML PDFLATEX DVIPDF EGREP M_OR_MM include_dir_suffix lib_dir_suffix docdir sdcc_include_dir sdcc_datadir OPT_ENABLE_UCSIM OPT_ENABLE_DEVICE_LIB_BUILD OPT_ENABLE_PACKIHX subdirs 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 AWK VERSION VERSIONHI VERSIONLO VERSIONP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB LEX LEXLIB LEX_OUTPUT_ROOT YACC AUTOCONF STRIP AS CP LYX LATEX LATEX2HTML PDFLATEX DVIPDF EGREP M_OR_MM include_dir_suffix lib_dir_suffix docdir OPT_ENABLE_UCSIM OPT_ENABLE_DEVICE_LIB_BUILD OPT_ENABLE_PACKIHX subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
_ACEOF
-### <Obsolete>
-sdcc_include_dir="\${datadir}/${include_dir_suffix}"
-
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_expand=$sdcc_include_dir
- test "x$ac_expand" = xNONE && ac_expand="$"NONE""
- ac_expand=`eval echo $ac_expand`
- expanded_sdcc_include_dir=`eval echo $ac_expand`
-
-cat >>confdefs.h <<_ACEOF
-#define SDCC_INCLUDE_DIR "${expanded_sdcc_include_dir}"
-_ACEOF
-
-
-sdcc_lib_dir="\${datadir}/\${lib_dir_suffix}"
-# AC_SUBST(sdcc_lib_dir)
-
- test "x$prefix" = xNONE && prefix="$ac_default_prefix"
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
- ac_expand=$sdcc_lib_dir
- test "x$ac_expand" = xNONE && ac_expand="$"NONE""
- ac_expand=`eval echo $ac_expand`
- expanded_sdcc_lib_dir=`eval echo $ac_expand`
-
-cat >>confdefs.h <<_ACEOF
-#define SDCC_LIB_DIR "${expanded_sdcc_lib_dir}"
-_ACEOF
-
-
-sdcc_datadir=${datadir}/sdcc
-
-
-### </Obsolete>
-
# environment variables
sdcc_dir_name="SDCC_HOME"
cat >>confdefs.h <<_ACEOF
s,@include_dir_suffix@,$include_dir_suffix,;t t
s,@lib_dir_suffix@,$lib_dir_suffix,;t t
s,@docdir@,$docdir,;t t
-s,@sdcc_include_dir@,$sdcc_include_dir,;t t
-s,@sdcc_datadir@,$sdcc_datadir,;t t
s,@OPT_ENABLE_UCSIM@,$OPT_ENABLE_UCSIM,;t t
s,@OPT_ENABLE_DEVICE_LIB_BUILD@,$OPT_ENABLE_DEVICE_LIB_BUILD,;t t
s,@OPT_ENABLE_PACKIHX@,$OPT_ENABLE_PACKIHX,;t t
AC_DEFINE_UNQUOTED(STD_DS390_LIB, "libds390")
AC_DEFINE_UNQUOTED(STD_xa51_LIB, "xa51")
-### <Obsolete>
-sdcc_include_dir="\${datadir}/${include_dir_suffix}"
-AC_SUBST(sdcc_include_dir)
-AC_EXPAND(sdcc_include_dir,
- "NONE", expanded_sdcc_include_dir)
-AC_DEFINE_UNQUOTED(SDCC_INCLUDE_DIR, "${expanded_sdcc_include_dir}")
-
-sdcc_lib_dir="\${datadir}/\${lib_dir_suffix}"
-# AC_SUBST(sdcc_lib_dir)
-AC_EXPAND(sdcc_lib_dir,
- "NONE", expanded_sdcc_lib_dir)
-AC_DEFINE_UNQUOTED(SDCC_LIB_DIR, "${expanded_sdcc_lib_dir}")
-
-sdcc_datadir=${datadir}/sdcc
-AC_SUBST(sdcc_datadir)
-
-### </Obsolete>
-
# environment variables
sdcc_dir_name="SDCC_HOME"
AC_DEFINE_UNQUOTED(SDCC_DIR_NAME, "${sdcc_dir_name}")
linkrec **linkrecs = NULL; /* all linkage editor records */
context *currCtxt = NULL;
short fullname = 0;
-char *ssdirl = SDCC_LIB_DIR ":" SDCC_LIB_DIR "/small" ;
+char *ssdirl = DATADIR LIB_DIR_SUFFIX ":" DATADIR LIB_DIR_SUFFIX "/small" ;
char *simArgs[40];
int nsimArgs = 0;
char model_str[20];
bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
-sdcc_datadir = @sdcc_datadir@
includedir = @includedir@
mandir = @mandir@
man1dir = $(mandir)/man1
infodir = @infodir@
srcdir = @srcdir@
+include_dir_suffix = @include_dir_suffix@
+
+sdcc_includedir = $(datadir)/$(include_dir_suffix)
+
CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR)
# Compiling and installing everything and runing test
# ---------------------------------------------------
install: all installdirs
- $(CP) -r asm *.h $(sdcc_datadir)/include/
+ $(CP) -r asm *.h $(sdcc_includedir)
# Deleting all the installed files
# --------------------------------
uninstall:
- rm -rf $(sdcc_datadir)/include
+ rm -rf $(sdcc_includedir)
# Performing self-test
# Creating installation directories
# ---------------------------------
installdirs:
- [ -d $(sdcc_datadir)/include ] || mkdir -p $(sdcc_datadir)/include
+ [ -d $(sdcc_includedir) ] || mkdir -p $(sdcc_includedir)
# Creating dependencies
bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
-sdcc_datadir = @sdcc_datadir@
includedir = @includedir@
mandir = @mandir@
man1dir = $(mandir)/man1
infodir = @infodir@
srcdir = @srcdir@
+lib_dir_suffix = @lib_dir_suffix@
+
+sdcc_libdir = $(datadir)/$(lib_dir_suffix)
+
CPPFLAGS = -I$(INCDIR)
CFLAGS = $(MODELFLAGS) --nostdinc --nostdlib
# Compiling and installing everything and runing test
# ---------------------------------------------------
install: all installdirs
- cp -r $(BUILDDIR)/* $(sdcc_datadir)/lib
- cp -r ds390 gbz80 z80 *.c $(sdcc_datadir)/lib/src
- rm `find $(sdcc_datadir)/lib/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm'`
+ cp -r $(BUILDDIR)/* $(sdcc_libdir)
+ cp -r ds390 gbz80 z80 *.c $(sdcc_libdir)/src
+ rm `find $(sdcc_libdir)/src -name '*.rel' -or -name '*.dump*' -or -name '*.sym' -or -name '*.o' -or -name '*.lst' -or -name '*.asm'`
# Deleting all the installed files
# --------------------------------
uninstall:
- rm -rf $(sdcc_datadir)/lib
+ rm -rf $(sdcc_libdir)
# Performing self-test
# --------------------
# Creating installation directories
# ---------------------------------
installdirs:
- [ -d $(sdcc_datadir)/lib ] || mkdir -p $(sdcc_datadir)/lib
+ [ -d $(sdcc_libdir) ] || mkdir -p $(sdcc_libdir)
for model in $(MODELS); do \
- [ -d $(sdcc_datadir)/lib/$$model ] || \
- mkdir -p $(sdcc_datadir)/lib/$$model; \
+ [ -d $(sdcc_libdir)/$$model ] || \
+ mkdir -p $(sdcc_libdir)/$$model; \
done
- [ -d $(sdcc_datadir)/lib/ds390 ] || mkdir -p $(sdcc_datadir)/lib/ds390
- mkdir -p $(sdcc_datadir)/lib/src
+ [ -d $(sdcc_libdir)/ds390 ] || mkdir -p $(sdcc_libdir)/ds390
+ mkdir -p $(sdcc_libdir)/src
# Creating dependencies
# ---------------------
dep:
$(TARGET): $(OBJECTS)
- $(CC) -o $@ $(OBJECTS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS)
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
#define PREFIX2DATA_DIR ""
#define BINDIR PREFIX "\\bin"
-// Obsolete:
-#define SDCC_INCLUDE_DIR "\\sdcc\\include"
-#define SDCC_LIB_DIR "\\sdcc\\lib"
-
/* environment variables */
#define SDCC_DIR_NAME "SDCC_HOME"
#define SDCC_INCLUDE_NAME "SDCC_INCLUDE"
#undef PREFIX2BIN_DIR
#undef PREFIX2DATA_DIR
-// Obsolete:
-#undef SDCC_INCLUDE_DIR
-#undef SDCC_LIB_DIR
-
/* environment variables */
#undef SDCC_DIR_NAME
#undef SDCC_INCLUDE_NAME
# My rules
# --------
$(TARGET): $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS)
- $(CC) -o $@ $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
+ $(CC) $(LDFLAGS) -o $@ $(SLIBOBJS) $(OBJECTS) $(PORT_LIBS) $(LIBDIRS) $(LIBS)
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) \
$(CFLAGS) $(WARN_CFLAGS) $(XCFLAGS) @DEFS@
ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
+LDFLAGS = @LDFLAGS@
CC = @CC@
AR = ar
all: $(BIN)
$(BIN): $(OBJ)
- $(CC) -o $(BIN) $(OBJ)
+ $(CC) $(LDFLAGS) -o $(BIN) $(OBJ)
install: all
mkdir -p $(bindir)