diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3817a22283..bae55d4d9b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +Wed Aug 04 10:12:24 1999 Gonzalo A. Diethelm + + * config/win32/gcc.cf: + Got rid of -( and -). + + * tests/working/Makefile: + Corrected the order of the libraries to link against. + 199908.04-16:32 GMT+3 Alexander Kresin * source/hbpp/table.c * change in @ y,x GET ... diff --git a/harbour/config/win32/gcc.cf b/harbour/config/win32/gcc.cf index 3cd39e70fc..1b80d8d356 100644 --- a/harbour/config/win32/gcc.cf +++ b/harbour/config/win32/gcc.cf @@ -24,7 +24,12 @@ LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH)) else LINKPATHS += -L$(HB_LIB_COMPILE) endif -LINKLIBS += -Wl,-( + +# The -( option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-( + LINKLIBS += $(foreach lib, $(LIBS), -l$(lib)) # This library is needed for kbhit() and getch() support. @@ -36,7 +41,11 @@ LINKPATHS += $(foreach drv, $(HB_DB_DRIVERS), -L$(TOP)$(ROOT)source/rdd/$(drv)/$ LINKLIBS += $(foreach drv, $(HB_DB_DRIVERS), -l$(drv)) endif -LINKLIBS += -Wl,-) +# The -) option could be appropriate to link against libraries with +# cyclic dependencies, but I think it is not really necessary if the +# libraries are kept in proper order. +# LINKLIBS += -Wl,-) + LDFLAGS = $(LINKPATHS) AR = ar diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile index 8a2b4a30bf..7e9418e2f4 100644 --- a/harbour/tests/working/Makefile +++ b/harbour/tests/working/Makefile @@ -1,4 +1,4 @@ - +# # $Id$ # @@ -6,9 +6,9 @@ ROOT = ../../ LIBS=\ tools \ + rdd \ vm \ rtl \ - rdd \ hbpp \ ifeq ($(PM),)