From: bernhardheld Date: Sat, 12 Apr 2003 19:48:48 +0000 (+0000) Subject: * src/SDCCutil.c (pathEquivalent): defined but not used X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=commitdiff_plain;h=31e09b642b8a7972c9103cef57fbd01227fbe3cb * src/SDCCutil.c (pathEquivalent): defined but not used * 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 --- diff --git a/.version b/.version index 3f684d2d..cc6c9a49 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.3.4 +2.3.5 diff --git a/ChangeLog b/ChangeLog index 7840c499..bdfa5c58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2003-04-12 Bernhard Held + + * 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 * completed "different paths" task: diff --git a/Makefile.common.in b/Makefile.common.in index 90d0edcb..8f8b7190 100644 --- a/Makefile.common.in +++ b/Makefile.common.in @@ -48,6 +48,7 @@ transform = @program_transform_name@ 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@ diff --git a/configure b/configure index 759b1fa3..9a2b8809 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ ac_includes_default="\ 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. @@ -6847,42 +6847,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -### -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 - - -### - # environment variables sdcc_dir_name="SDCC_HOME" cat >>confdefs.h <<_ACEOF @@ -7826,8 +7790,6 @@ s,@M_OR_MM@,$M_OR_MM,;t t 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 diff --git a/configure.in b/configure.in index d72ebe4a..2d7991b3 100755 --- a/configure.in +++ b/configure.in @@ -512,24 +512,6 @@ AC_DEFINE_UNQUOTED(STD_FP_LIB, "libfloat") AC_DEFINE_UNQUOTED(STD_DS390_LIB, "libds390") AC_DEFINE_UNQUOTED(STD_xa51_LIB, "xa51") -### -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) - -### - # environment variables sdcc_dir_name="SDCC_HOME" AC_DEFINE_UNQUOTED(SDCC_DIR_NAME, "${sdcc_dir_name}") diff --git a/debugger/mcs51/sdcdb.c b/debugger/mcs51/sdcdb.c index 267dc7f2..53a1a38c 100644 --- a/debugger/mcs51/sdcdb.c +++ b/debugger/mcs51/sdcdb.c @@ -39,7 +39,7 @@ int nLinkrecs = 0; 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]; diff --git a/device/include/Makefile.in b/device/include/Makefile.in index 52cde817..f4c30613 100644 --- a/device/include/Makefile.in +++ b/device/include/Makefile.in @@ -19,7 +19,6 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ -sdcc_datadir = @sdcc_datadir@ includedir = @includedir@ mandir = @mandir@ man1dir = $(mandir)/man1 @@ -27,6 +26,10 @@ man2dir = $(mandir)/man2 infodir = @infodir@ srcdir = @srcdir@ +include_dir_suffix = @include_dir_suffix@ + +sdcc_includedir = $(datadir)/$(include_dir_suffix) + CPPFLAGS = @CPPFLAGS@ -I$(PRJDIR) @@ -37,13 +40,13 @@ all: # 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 @@ -59,7 +62,7 @@ installcheck: # Creating installation directories # --------------------------------- installdirs: - [ -d $(sdcc_datadir)/include ] || mkdir -p $(sdcc_datadir)/include + [ -d $(sdcc_includedir) ] || mkdir -p $(sdcc_includedir) # Creating dependencies diff --git a/device/lib/Makefile.in b/device/lib/Makefile.in index 2dc7cb83..055e58cb 100644 --- a/device/lib/Makefile.in +++ b/device/lib/Makefile.in @@ -23,7 +23,6 @@ exec_prefix = @exec_prefix@ bindir = @bindir@ libdir = @libdir@ datadir = @datadir@ -sdcc_datadir = @sdcc_datadir@ includedir = @includedir@ mandir = @mandir@ man1dir = $(mandir)/man1 @@ -31,6 +30,10 @@ man2dir = $(mandir)/man2 infodir = @infodir@ srcdir = @srcdir@ +lib_dir_suffix = @lib_dir_suffix@ + +sdcc_libdir = $(datadir)/$(lib_dir_suffix) + CPPFLAGS = -I$(INCDIR) CFLAGS = $(MODELFLAGS) --nostdinc --nostdlib @@ -179,14 +182,14 @@ clean_intermediate: # 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 # -------------------- @@ -201,13 +204,13 @@ installcheck: # 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 # --------------------- diff --git a/packihx/Makefile.in b/packihx/Makefile.in index d13d006d..8fe6bfc9 100644 --- a/packihx/Makefile.in +++ b/packihx/Makefile.in @@ -42,7 +42,7 @@ installdirs: dep: $(TARGET): $(OBJECTS) - $(CC) -o $@ $(OBJECTS) + $(CC) $(LDFLAGS) -o $@ $(OBJECTS) .c.o: $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ diff --git a/sdcc_vc_in.h b/sdcc_vc_in.h index 9999b438..ff235dd0 100644 --- a/sdcc_vc_in.h +++ b/sdcc_vc_in.h @@ -27,10 +27,6 @@ #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" diff --git a/sdccconf_in.h b/sdccconf_in.h index f4e17026..95d97173 100644 --- a/sdccconf_in.h +++ b/sdccconf_in.h @@ -25,10 +25,6 @@ #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 diff --git a/src/Makefile.in b/src/Makefile.in index 9f1b9fde..de2108db 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -95,7 +95,7 @@ include clean.mk # 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 $@ diff --git a/support/cpp2/Makefile.in b/support/cpp2/Makefile.in index a1fb8d56..c4ec20e5 100644 --- a/support/cpp2/Makefile.in +++ b/support/cpp2/Makefile.in @@ -38,6 +38,7 @@ CFLAGS = @CFLAGS@ 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 diff --git a/support/makebin/Makefile b/support/makebin/Makefile index c6c92d28..de2ea9ae 100644 --- a/support/makebin/Makefile +++ b/support/makebin/Makefile @@ -8,7 +8,7 @@ include $(PRJDIR)/Makefile.common all: $(BIN) $(BIN): $(OBJ) - $(CC) -o $(BIN) $(OBJ) + $(CC) $(LDFLAGS) -o $(BIN) $(OBJ) install: all mkdir -p $(bindir)