From 81e156d04cb08224f126d08b4ec8b4307c2f566a Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Mon, 31 Oct 2005 13:38:05 +0000 Subject: [PATCH] Some files removed cause recent changes --- harbour/makefile.nt | 14 +++--------- harbour/makefile64.nt | 52 ++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/harbour/makefile.nt b/harbour/makefile.nt index 8ea2492041..63a1b37f53 100644 --- a/harbour/makefile.nt +++ b/harbour/makefile.nt @@ -595,7 +595,6 @@ RDD_LIB_OBJS = \ $(OBJ_DIR)\delim1.obj \ $(OBJ_DIR)\sdf1.obj \ \ - $(OBJ_DIR)\dbf0.obj \ $(OBJ_DIR)\dbtotal.obj \ $(OBJ_DIR)\dbfuncs.obj \ $(OBJ_DIR)\dblist.obj \ @@ -603,10 +602,8 @@ RDD_LIB_OBJS = \ $(OBJ_DIR)\hbdbsort.obj \ $(OBJ_DIR)\dbstrux.obj \ $(OBJ_DIR)\dbupdat.obj \ - $(OBJ_DIR)\delim0.obj \ $(OBJ_DIR)\rddord.obj \ - $(OBJ_DIR)\rddsys.obj \ - $(OBJ_DIR)\sdf0.obj + $(OBJ_DIR)\rddsys.obj # # NULSYS.LIB rules @@ -651,10 +648,7 @@ DBFNTX_LIB_OBJS = \ DBFCDX_LIB_OBJS = \ $(OBJ_DIR)\dbfcdx1.obj \ - $(OBJ_DIR)\sixcdx1.obj \ - \ - $(OBJ_DIR)\dbfcdx0.obj \ - $(OBJ_DIR)\sixcdx0.obj + $(OBJ_DIR)\sixcdx1.obj # # HBSIX.LIB rules @@ -691,9 +685,7 @@ HSX_LIB_OBJS = \ $(MAKE) -nologo /$(MK_FLAGS)f$(MK_FILE) $(DBFFPT_LIB)2 DBFFPT_LIB_OBJS = \ - $(OBJ_DIR)\dbffpt1.obj \ - \ - $(OBJ_DIR)\dbffpt0.obj + $(OBJ_DIR)\dbffpt1.obj # # PP.LIB rules diff --git a/harbour/makefile64.nt b/harbour/makefile64.nt index d95fa087d3..0ba4b05924 100644 --- a/harbour/makefile64.nt +++ b/harbour/makefile64.nt @@ -595,7 +595,6 @@ RDD_LIB_OBJS = \ $(OBJ_DIR)\delim1.obj \ $(OBJ_DIR)\sdf1.obj \ \ - $(OBJ_DIR)\dbf0.obj \ $(OBJ_DIR)\dbtotal.obj \ $(OBJ_DIR)\dbfuncs.obj \ $(OBJ_DIR)\dblist.obj \ @@ -603,10 +602,8 @@ RDD_LIB_OBJS = \ $(OBJ_DIR)\hbdbsort.obj \ $(OBJ_DIR)\dbstrux.obj \ $(OBJ_DIR)\dbupdat.obj \ - $(OBJ_DIR)\delim0.obj \ $(OBJ_DIR)\rddord.obj \ - $(OBJ_DIR)\rddsys.obj \ - $(OBJ_DIR)\sdf0.obj + $(OBJ_DIR)\rddsys.obj # # NULSYS.LIB rules @@ -651,26 +648,7 @@ DBFNTX_LIB_OBJS = \ DBFCDX_LIB_OBJS = \ $(OBJ_DIR)\dbfcdx1.obj \ - $(OBJ_DIR)\sixcdx1.obj \ - \ - $(OBJ_DIR)\dbfcdx0.obj \ - $(OBJ_DIR)\sixcdx0.obj - -# -# DBFFPT.LIB rules -# - -{$(RDD_DIR)\dbffpt}.c{$(OBJ_DIR)}.obj:: - $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< - -{$(RDD_DIR)\dbffpt}.prg{$(OBJ_DIR)}.obj:: - $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< - $(MAKE) -nologo /$(MK_FLAGS)f$(MK_FILE) $(DBFFPT_LIB)2 - -DBFFPT_LIB_OBJS = \ - $(OBJ_DIR)\dbffpt1.obj \ - \ - $(OBJ_DIR)\dbffpt0.obj + $(OBJ_DIR)\sixcdx1.obj # # HBSIX.LIB rules @@ -695,6 +673,20 @@ HSX_LIB_OBJS = \ $(OBJ_DIR)\hsx.obj \ $(OBJ_DIR)\cftsfunc.obj +# +# DBFFPT.LIB rules +# + +{$(RDD_DIR)\dbffpt}.c{$(OBJ_DIR)}.obj:: + $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $< + +{$(RDD_DIR)\dbffpt}.prg{$(OBJ_DIR)}.obj:: + $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $< + $(MAKE) -nologo /$(MK_FLAGS)f$(MK_FILE) $(DBFFPT_LIB)2 + +DBFFPT_LIB_OBJS = \ + $(OBJ_DIR)\dbffpt1.obj + # # PP.LIB rules # @@ -1140,18 +1132,18 @@ $(RDD_LIB) : $(RDD_LIB_OBJS) $(DBFCDX_LIB) : $(DBFCDX_LIB_OBJS) lib /out:$@ $** -$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) - lib /out:$@ $** - -$(HSX_LIB) : $(HSX_LIB_OBJS) - lib /out:$@ $** - $(DBFNTX_LIB) : $(DBFNTX_LIB_OBJS) lib /out:$@ $** $(DBFFPT_LIB) : $(DBFFPT_LIB_OBJS) lib /out:$@ $** +$(HBSIX_LIB) : $(HBSIX_LIB_OBJS) + lib /out:$@ $** + +$(HSX_LIB) : $(HSX_LIB_OBJS) + lib /out:$@ $** + $(NULSYS_LIB) : $(NULSYS_LIB_OBJS) lib /out:$@ $**