From d0f30007dae0a1479d1f7e30002d2141f5b37d02 Mon Sep 17 00:00:00 2001 From: "Gonzalo A. Diethelm" Date: Fri, 30 Jul 1999 19:02:10 +0000 Subject: [PATCH] ChangeLogTag:Fri Jul 30 14:44:00 1999 Gonzalo A. Diethelm --- harbour/ChangeLog | 34 +++++++++++++++++++ harbour/config/bin.cf | 13 +++++++ harbour/config/c.cf | 4 +-- harbour/config/header.cf | 4 +-- harbour/config/prg.cf | 4 ++- harbour/include/run_exp.h | 2 ++ harbour/source/hbpp/Makefile | 6 +++- harbour/source/hbpp/stdalone/Makefile | 14 ++++++++ .../hbpp/{hbppmain.c => stdalone/hbpp.c} | 0 harbour/source/odbc/Makefile | 16 +++++++++ harbour/source/rtl/files.c | 2 +- harbour/source/rtl/gt/gtwin.c | 2 +- harbour/source/runner/Makefile | 13 +++++++ 13 files changed, 106 insertions(+), 8 deletions(-) create mode 100644 harbour/source/hbpp/stdalone/Makefile rename harbour/source/hbpp/{hbppmain.c => stdalone/hbpp.c} (100%) create mode 100644 harbour/source/odbc/Makefile create mode 100644 harbour/source/runner/Makefile diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 520b5f1251..8b51b5887c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,37 @@ +Fri Jul 30 14:44:00 1999 Gonzalo A. Diethelm + + * 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 - buildicc.cmd - Removed. - tests/working/list.txt - Removed, since it was diff --git a/harbour/config/bin.cf b/harbour/config/bin.cf index 536151666d..81d273c1c4 100644 --- a/harbour/config/bin.cf +++ b/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),) diff --git a/harbour/config/c.cf b/harbour/config/c.cf index d0355c0b94..46719adfb9 100644 --- a/harbour/config/c.cf +++ b/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) diff --git a/harbour/config/header.cf b/harbour/config/header.cf index c141236a15..e8cb64f205 100644 --- a/harbour/config/header.cf +++ b/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) diff --git a/harbour/config/prg.cf b/harbour/config/prg.cf index 8ff746c590..ea2e67d5a2 100644 --- a/harbour/config/prg.cf +++ b/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 diff --git a/harbour/include/run_exp.h b/harbour/include/run_exp.h index eb21b37b95..c7a102a417 100644 --- a/harbour/include/run_exp.h +++ b/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_ */ diff --git a/harbour/source/hbpp/Makefile b/harbour/source/hbpp/Makefile index 8891fb56eb..a74a76fa6d 100644 --- a/harbour/source/hbpp/Makefile +++ b/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 -# \ No newline at end of file +# diff --git a/harbour/source/hbpp/stdalone/Makefile b/harbour/source/hbpp/stdalone/Makefile new file mode 100644 index 0000000000..8afb073f8d --- /dev/null +++ b/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 diff --git a/harbour/source/hbpp/hbppmain.c b/harbour/source/hbpp/stdalone/hbpp.c similarity index 100% rename from harbour/source/hbpp/hbppmain.c rename to harbour/source/hbpp/stdalone/hbpp.c diff --git a/harbour/source/odbc/Makefile b/harbour/source/odbc/Makefile new file mode 100644 index 0000000000..12e6f03057 --- /dev/null +++ b/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 diff --git a/harbour/source/rtl/files.c b/harbour/source/rtl/files.c index bd75c1edc2..ec3b71a716 100644 --- a/harbour/source/rtl/files.c +++ b/harbour/source/rtl/files.c @@ -12,7 +12,7 @@ #include #endif -#if defined(__GNUC__) +#if defined(__CYGWIN__) #include #include #include diff --git a/harbour/source/rtl/gt/gtwin.c b/harbour/source/rtl/gt/gtwin.c index 7ed8696d69..d2e5e47948 100644 --- a/harbour/source/rtl/gt/gtwin.c +++ b/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"); diff --git a/harbour/source/runner/Makefile b/harbour/source/runner/Makefile new file mode 100644 index 0000000000..5feb224a62 --- /dev/null +++ b/harbour/source/runner/Makefile @@ -0,0 +1,13 @@ +# +# $Id$ +# + +ROOT = ../../ + +C_SOURCES=\ + +C_MAIN=runner.c + +LIBS=\ + +include $(TOP)$(ROOT)config/bin.cf