diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2c459ebfa8..fe72e3cf1a 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,11 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-02-22 13:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * harbour/contrib/libct/makefile.bc + * harbour/contrib/libct/makefile.vc + ! Synced with GNU makefile changes. + 2007-02-22 08:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbexprop.h * harbour/source/common/expropt1.c diff --git a/harbour/contrib/libct/makefile.bc b/harbour/contrib/libct/makefile.bc index 63e332692a..0cb05ccc67 100644 --- a/harbour/contrib/libct/makefile.bc +++ b/harbour/contrib/libct/makefile.bc @@ -96,9 +96,7 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\atadjust.obj \ $(OBJ_DIR)\atnum.obj \ $(OBJ_DIR)\atrepl.obj \ - $(OBJ_DIR)\bit1.obj \ - $(OBJ_DIR)\bit2.obj \ - $(OBJ_DIR)\bit3.obj \ + $(OBJ_DIR)\bitnum.obj \ $(OBJ_DIR)\charevod.obj \ $(OBJ_DIR)\charlist.obj \ $(OBJ_DIR)\charmirr.obj \ @@ -198,15 +196,7 @@ $(OBJ_DIR)\atrepl.obj : $(TOOLS_DIR)\atrepl.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, -$(OBJ_DIR)\bit1.obj : $(TOOLS_DIR)\bit1.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\bit2.obj : $(TOOLS_DIR)\bit2.c - $(CC) $(CLIBFLAGS) -o$@ $** - tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, - -$(OBJ_DIR)\bit3.obj : $(TOOLS_DIR)\bit3.c +$(OBJ_DIR)\bitnum.obj : $(TOOLS_DIR)\bitnum.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, @@ -460,4 +450,3 @@ $(OBJ_DIR)\setlast.c : $(TOOLS_DIR)\setlast.prg $(OBJ_DIR)\setlast.obj : $(OBJ_DIR)\setlast.c $(CC) $(CLIBFLAGS) -o$@ $** tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,, - diff --git a/harbour/contrib/libct/makefile.vc b/harbour/contrib/libct/makefile.vc index f296de8b79..21d1cc257e 100644 --- a/harbour/contrib/libct/makefile.vc +++ b/harbour/contrib/libct/makefile.vc @@ -116,9 +116,7 @@ TOOLS_LIB_OBJS = \ $(OBJ_DIR)\atadjust.obj \ $(OBJ_DIR)\atnum.obj \ $(OBJ_DIR)\atrepl.obj \ - $(OBJ_DIR)\bit1.obj \ - $(OBJ_DIR)\bit2.obj \ - $(OBJ_DIR)\bit3.obj \ + $(OBJ_DIR)\bitnum.obj \ $(OBJ_DIR)\charevod.obj \ $(OBJ_DIR)\charlist.obj \ $(OBJ_DIR)\charmirr.obj \ @@ -189,9 +187,7 @@ CLEAN: -@if exist $(OBJ_DIR)\atadjust.* del $(OBJ_DIR)\atadjust.* -@if exist $(OBJ_DIR)\atnum.* del $(OBJ_DIR)\atnum.* -@if exist $(OBJ_DIR)\atrepl.* del $(OBJ_DIR)\atrepl.* - -@if exist $(OBJ_DIR)\bit1.* del $(OBJ_DIR)\bit2.* - -@if exist $(OBJ_DIR)\bit2.* del $(OBJ_DIR)\bit2.* - -@if exist $(OBJ_DIR)\bit3.* del $(OBJ_DIR)\bit2.* + -@if exist $(OBJ_DIR)\bitnum.* del $(OBJ_DIR)\bitnum.* -@if exist $(OBJ_DIR)\charevod.* del $(OBJ_DIR)\charevod.* -@if exist $(OBJ_DIR)\charlist.* del $(OBJ_DIR)\charlist.* -@if exist $(OBJ_DIR)\charmirr.* del $(OBJ_DIR)\charmirr.* @@ -255,4 +251,3 @@ $(TOOLS_LIB) : $(TOOLS_LIB_OBJS) # dummy targets used for prg to c creation $(TOOLS_LIB)2 : $(TOOLS_LIB_OBJS) -