ChangeLogTag:Fri Jul 30 14:44:00 1999 Gonzalo A. Diethelm <Gonzalo.Diethelm@jda.cl>

harbour/ChangeLog

@@ -1,3 +1,37 @@
+Fri Jul 30 14:44:00 1999  Gonzalo A. Diethelm  <Gonzalo.Diethelm@jda.cl>
+
+	* config/bin.cf: 
+	* config/c.cf: 
+	* config/prg.cf: 
+	Added support for recursing into subdirectories in addition to
+	creating a target (library or executable).
+	Added support for executables whose main function is defined in a
+	PRG file.
+
+	* config/header.cf: 
+	Temporarily got rid of two definitions that look buggy.
+	
+	* include/run_exp.h: 
+	Got rid of warning regarding pragma.
+	
+	* source/hbpp/Makefile: 
+	* source/hbpp/hbppmain.c: 
+	* source/hbpp/stdalone/Makefile: 
+	* source/hbpp/stdalone/hbpp.c: 
+	Support for recursing into stdalone.
+	Moved hbpp/hbppmain.c tp hbpp/stdalone/hbpp.c.
+	
+	* source/odbc/Makefile: 
+	* source/runner/Makefile: 
+	Added GNU-makefiles for these two directories (but they don'
+	compile ok under gcc/Win32).
+	
+	* source/rtl/files.c: 
+	Changed defined(__GNUC__) for defined(__CYGWIN__).
+
+	* source/rtl/gt/gtwin.c: 
+	Got rid of a warning.
+
 19990730-20:24 CET Victor Szel <info@szelvesz.hu>
    - buildicc.cmd - Removed.
    - tests/working/list.txt - Removed, since it was

harbour/config/bin.cf

@@ -4,8 +4,21 @@
 
 include $(TOP)$(ROOT)config/global.cf
 include $(TOP)$(ROOT)config/c.cf
+include $(TOP)$(ROOT)config/prg.cf
 
+EXE_NAME=
+
+ifneq ($(C_MAIN),)
+ifeq ($(EXE_NAME),)
 EXE_NAME = $(C_MAIN:.c=$(EXE_EXT))
+endif
+endif
+
+ifneq ($(PRG_MAIN),)
+ifeq ($(EXE_NAME),)
+EXE_NAME = $(PRG_MAIN:.prg=$(EXE_EXT))
+endif
+endif
 
 _EXE_ARCH = $(notdir $(ARCH_DIR))
 ifeq ($(_EXE_ARCH),)

harbour/config/c.cf

@@ -4,7 +4,7 @@
 
 C_OBJS = $(C_SOURCES:.c=$(OBJ_EXT))
 
-MAIN_OBJ = $(C_MAIN:.c=$(OBJ_EXT))
+C_MAIN_OBJ = $(C_MAIN:.c=$(OBJ_EXT))
 
 ifdef YACC_SOURCE
 YACC_BASE = $(YACC_SOURCE:.y=)
@@ -23,7 +23,7 @@ LEX_OBJ = $(LEX_C:.c=$(OBJ_EXT))
 LEX_HB_H := $(foreach h, $(LEX_HEADERS), $(HB_INC_COMPILE)/$(h))
 endif
 
-ALL_C_OBJS = $(C_OBJS) $(MAIN_OBJ) $(YACC_OBJ) $(LEX_OBJ)
+ALL_C_OBJS = $(C_OBJS) $(C_MAIN_OBJ) $(YACC_OBJ) $(LEX_OBJ)
 
 $(YACC_OBJ) : $(YACC_C)
 

harbour/config/header.cf

@@ -4,8 +4,8 @@
 
 include $(TOP)$(ROOT)config/global.cf
 
-EXE_NAME = $(C_MAIN:.c=$(EXE_EXT))
-EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
+#EXE_NAME = $(C_MAIN:.c=$(EXE_EXT))
+#EXE_ARCH = $(ARCH_DIR)$(EXE_NAME)
 
 ALL_HEADERS = $(C_HEADERS) $(PRG_HEADERS) $(API_HEADERS)
 

harbour/config/prg.cf

@@ -6,7 +6,9 @@ PRG_C_SOURCES = $(PRG_SOURCES:.prg=.c)
 PRG_OBJS = $(PRG_SOURCES:.prg=$(OBJ_EXT))
 PRG_EXES = $(PRG_SOURCES:.prg=$(EXE_EXT))
 
-ALL_PRG_OBJS = $(PRG_OBJS)
+PRG_MAIN_OBJ = $(PRG_MAIN:.prg=$(OBJ_EXT))
+
+ALL_PRG_OBJS = $(PRG_OBJS) $(PRG_MAIN_OBJ)
 
 $(PRG_OBJS) : %$(OBJ_EXT) : %.c
 

harbour/include/run_exp.h

@@ -132,6 +132,8 @@ HB_INIT_SYMBOLS_BEGIN( RUNNER )
 { "TOCHAR",         FS_PUBLIC, HB_TOCHAR        , 0 },
 { "VALTYPE",        FS_PUBLIC, HB_VALTYPE       , 0 }
 HB_INIT_SYMBOLS_END( RUNNER );
+#if ! defined(__GNUC__)
 #pragma startup RUNNER
+#endif
 
 #endif /* HB_RUN_EXP_H_ */

harbour/source/hbpp/Makefile

@@ -12,7 +12,11 @@ C_SOURCES=\
 
 LIB=hbpp
 
+DIRS=\
+	stdalone \
+
 include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/dir.cf
 
 #
 # This is for building the stand-alone preprocessor.
@@ -20,4 +24,4 @@ include $(TOP)$(ROOT)config/lib.cf
 #C_MAIN=hbppmain.c
 #
 #include $(TOP)$(ROOT)config/bin.cf
-#
+#

harbour/source/hbpp/stdalone/Makefile

@@ -0,0 +1,14 @@
+#
+# $Id$
+#
+
+ROOT = ../../../
+
+C_SOURCES=\
+
+C_MAIN=hbpp.c
+
+LIBS=\
+	hbpp \
+
+include $(TOP)$(ROOT)config/bin.cf

harbour/source/odbc/Makefile

@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+
+ROOT = ../../
+
+C_SOURCES=\
+	odbc.c \
+
+PRG_SOURCES=\
+
+PRG_MAIN=testodbc.prg
+
+LIBS=\
+
+include $(TOP)$(ROOT)config/bin.cf

harbour/source/rtl/files.c

@@ -12,7 +12,7 @@
   #include <mingw32/share.h>
 #endif
 
-#if defined(__GNUC__)
+#if defined(__CYGWIN__)
   #include <sys/types.h>
   #include <sys/stat.h>
   #include <unistd.h>

harbour/source/rtl/gt/gtwin.c

@@ -183,7 +183,7 @@ int gtGetCursorStyle(void)
 
 void gtPuts(char cRow, char cCol, char attr, char *str, int len)
 {
-  DWORD i, dwlen;
+  DWORD dwlen;
   COORD coord;
 
   LOG("Puts");

harbour/source/runner/Makefile

@@ -0,0 +1,13 @@
+#
+# $Id$
+#
+
+ROOT = ../../
+
+C_SOURCES=\
+
+C_MAIN=runner.c
+
+LIBS=\
+
+include $(TOP)$(ROOT)config/bin.cf