From 9b2f72dc5abed09457594cb30be7ab1e840831fc Mon Sep 17 00:00:00 2001 From: Maurilio Longo Date: Sat, 13 May 2000 12:00:12 +0000 Subject: [PATCH] 20000513-13:51 GMT+2 Maurilio Longo --- harbour/ChangeLog | 11 +++++++++++ harbour/makefile.bc | 10 +++++----- harbour/makefile.vc | 2 +- harbour/source/rtl/Makefile | 2 +- harbour/source/rtl/{stringsx.c => teditorl.c} | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) rename harbour/source/rtl/{stringsx.c => teditorl.c} (97%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 167b0dbc0a..16d289c58f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +20000513-13:51 GMT+2 Maurilio Longo + + - source/rtl/stringsx.c + - removed + + source/rtl/teditorl.c + + added + * source/rtl/Makefile + * Makefile.bc + * Makefile.vc + * changed to reflect previous changes + 20000513-00:51 GMT+2 Maurilio Longo * Makefile.bc diff --git a/harbour/makefile.bc b/harbour/makefile.bc index 6f3d44ccb9..074b4e83f6 100644 --- a/harbour/makefile.bc +++ b/harbour/makefile.bc @@ -243,12 +243,12 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\str.obj \ $(OBJ_DIR)\strcase.obj \ $(OBJ_DIR)\strings.obj \ - $(OBJ_DIR)\stringsx.obj \ $(OBJ_DIR)\strmatch.obj \ $(OBJ_DIR)\strtran.obj \ $(OBJ_DIR)\strzero.obj \ $(OBJ_DIR)\stuff.obj \ $(OBJ_DIR)\substr.obj \ + $(OBJ_DIR)\teditorl.obj \ $(OBJ_DIR)\tone.obj \ $(OBJ_DIR)\trace.obj \ $(OBJ_DIR)\transfrm.obj \ @@ -1418,10 +1418,6 @@ $(OBJ_DIR)\strings.obj : $(RTL_DIR)\strings.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, -$(OBJ_DIR)\stringsx.obj : $(RTL_DIR)\stringsx.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(RTL_LIB) $(ARFLAGS) -+$@,, - $(OBJ_DIR)\strmatch.obj : $(RTL_DIR)\strmatch.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, @@ -1470,6 +1466,10 @@ $(OBJ_DIR)\teditor.obj : $(OBJ_DIR)\teditor.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(RTL_LIB) $(ARFLAGS) -+$@,, +$(OBJ_DIR)\teditorl.obj : $(RTL_DIR)\teditorl.c + $(CC) $(CLIBFLAGS) -o$@ $** + tlib $(RTL_LIB) $(ARFLAGS) -+$@,, + $(OBJ_DIR)\terror.c : $(RTL_DIR)\terror.prg $(HARBOUR_EXE) $(HARBOURFLAGS) $** -o$@ diff --git a/harbour/makefile.vc b/harbour/makefile.vc index f79a8ca676..5709e40a56 100644 --- a/harbour/makefile.vc +++ b/harbour/makefile.vc @@ -273,12 +273,12 @@ RTL_LIB_OBJS = \ $(OBJ_DIR)\str.obj \ $(OBJ_DIR)\strcase.obj \ $(OBJ_DIR)\strings.obj \ - $(OBJ_DIR)\stringsx.obj \ $(OBJ_DIR)\strmatch.obj \ $(OBJ_DIR)\strtran.obj \ $(OBJ_DIR)\strzero.obj \ $(OBJ_DIR)\stuff.obj \ $(OBJ_DIR)\substr.obj \ + $(OBJ_DIR)\teditorl.obj \ $(OBJ_DIR)\tone.obj \ $(OBJ_DIR)\trace.obj \ $(OBJ_DIR)\transfrm.obj \ diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile index dcbcdd040c..9de83696db 100644 --- a/harbour/source/rtl/Makefile +++ b/harbour/source/rtl/Makefile @@ -88,12 +88,12 @@ C_SOURCES=\ str.c \ strcase.c \ strings.c \ - stringsx.c \ strmatch.c \ strtran.c \ strzero.c \ stuff.c \ substr.c \ + teditorl.c \ tone.c \ trace.c \ transfrm.c \ diff --git a/harbour/source/rtl/stringsx.c b/harbour/source/rtl/teditorl.c similarity index 97% rename from harbour/source/rtl/stringsx.c rename to harbour/source/rtl/teditorl.c index 7e31f98832..a1fcc823d8 100644 --- a/harbour/source/rtl/stringsx.c +++ b/harbour/source/rtl/teditorl.c @@ -6,7 +6,7 @@ * Harbour Project source code: * __STRTOKEN() helper routine for TEDITOR.PRG * - * Copyright 2000 Harbour project. + * Copyright 1999 {list of individual authors and e-mail addresses} * www - http://www.harbour-project.org * * This program is free software; you can redistribute it and/or modify