2008-06-21 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

* contrib/Makefile - contrib/hbgf/gtk - contrib/hbgf/os2pm - contrib/hbgf/win32 + contrib/hbgf/hbgfw32 + contrib/hbgf/hbgfos2 + contrib/hbgf/hbgfgtk + contrib/hbgf/Makefile * contrib/hbgf/hbgfos2/Makefile + Decentralized GNU make for these contribs. * Renamed according to stds. ! Fix to be built under Linux/Win32. (if they don't work they should be fixed/disabled locally) * contrib/Makefile * contrib/hbodbc/Makefile * contrib/hbw32/Makefile * contrib/rddado/Makefile * Further decentralization of contrib building decisions. + Added all existing contribs to the list. Separated into two sections: standalone contribs, and ones with external dependencies. ; TODO: Refine this by some clever commenting. This is a multiplatform issue, so we need to work together. * contrib/examples/Makefile ! Fixed to include newly added examples. * contrib/hbapollo/make_b32.bat * contrib/hbapollo/make_vc.bat * contrib/hbcurl/make_b32.bat * contrib/hbcurl/make_vc.bat * contrib/hbfbird/make_b32.bat * contrib/hbfbird/make_vc.bat * contrib/hbfimage/make_b32.bat * contrib/hbfimage/make_vc.bat * contrib/hbgd/make_b32.bat * contrib/hbgd/make_vc.bat * contrib/hbhpdf/make_b32.bat * contrib/hbhpdf/make_vc.bat * contrib/hbmysql/make_b32.bat * contrib/hbmysql/make_vc.bat * contrib/hbpgsql/make_b32.bat * contrib/hbpgsql/make_vc.bat * contrib/rddads/make_b32.bat * contrib/rddads/make_vc.bat + Some steps made to make it possible to disable any messings with .dlls. This is not yet complete, and the goal is to be able to use HB_INC_* to specify include dirs for external packages on all make systems (GNU, non-GNU .bat, non-GNU .sh) [TOMERGE 1.0.0RC1]
2008-06-21 16:00:23 +00:00
parent efbb4c54ee
commit 67c8fbb275
61 changed files with 165 additions and 19 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,75 @@
   2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2008-06-21 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/Makefile
+   - contrib/hbgf/gtk
+   - contrib/hbgf/os2pm
+   - contrib/hbgf/win32
+   + contrib/hbgf/hbgfw32
+   + contrib/hbgf/hbgfos2
+   + contrib/hbgf/hbgfgtk
+   + contrib/hbgf/Makefile
+   * contrib/hbgf/hbgfos2/Makefile
+     + Decentralized GNU make for these contribs.
+     * Renamed according to stds.
+     ! Fix to be built under Linux/Win32.
+       (if they don't work they should be fixed/disabled locally)
+
+   * contrib/Makefile
+   * contrib/hbodbc/Makefile
+   * contrib/hbw32/Makefile
+   * contrib/rddado/Makefile
+     * Further decentralization of contrib building decisions.
+     + Added all existing contribs to the list. Separated into 
+       two sections: standalone contribs, and ones with external 
+       dependencies.
+     ; TODO: Refine this by some clever commenting.
+             This is a multiplatform issue, so we need to 
+             work together.
+
+   * contrib/examples/Makefile
+     ! Fixed to include newly added examples.
+
+   * contrib/hbapollo/make_b32.bat
+   * contrib/hbapollo/make_vc.bat
+   * contrib/hbcurl/make_b32.bat
+   * contrib/hbcurl/make_vc.bat
+   * contrib/hbfbird/make_b32.bat
+   * contrib/hbfbird/make_vc.bat
+   * contrib/hbfimage/make_b32.bat
+   * contrib/hbfimage/make_vc.bat
+   * contrib/hbgd/make_b32.bat
+   * contrib/hbgd/make_vc.bat
+   * contrib/hbhpdf/make_b32.bat
+   * contrib/hbhpdf/make_vc.bat
+   * contrib/hbmysql/make_b32.bat
+   * contrib/hbmysql/make_vc.bat
+   * contrib/hbpgsql/make_b32.bat
+   * contrib/hbpgsql/make_vc.bat
+   * contrib/rddads/make_b32.bat
+   * contrib/rddads/make_vc.bat
+     + Some steps made to make it possible to disable 
+       any messings with .dlls. This is not yet complete, 
+       and the goal is to be able to use HB_INC_* to 
+       specify include dirs for external packages on 
+       all make systems (GNU, non-GNU .bat, non-GNU .sh)
+       [TOMERGE 1.0.0RC1]
+
+2008-06-21 17:33 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   - contrib/hbgf/gtk
+   - contrib/hbgf/os2pm
+   - contrib/hbgf/win32
+   + contrib/hbgf/hbgfw32
+   + contrib/hbgf/hbgfos2
+   + contrib/hbgf/hbgfgtk
+   + contrib/hbgf/Makefile
+   * contrib/hbgf/hbgfos2/Makefile
+     + Decentralized GNU make for these contribs.
+     * Renamed according to stds.
+     ! Fix to be built under Linux/Win32.
+       (if they don't work they should be fixed/disabled locally)
+
 2008-06-21 17:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbw32ddr/Makefile
     ! Fixed to compile with GNU make.
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -4,38 +4,49 @@

 ROOT = ../

+# standalone contribs
 DIRS=\
 	gtwvg \
 	hbbmcdx \
 	hbbtree \
+	hbclipsm \
 	hbct \
+	hbgf \
 	hbgt \
 	hbmisc \
-	hbnf \
-	hbclipsm \
-	hbvpdf \
 	hbmzip \
+	hbnf \
+	hbodbc \
+	hbole \
+	hbsqlit2 \
+	hbsqlit3 \
 	hbtip \
+	hbtpathy \
+	hbvpdf \
+	hbw32 \
+	hbw32ddr \
+	hbwhat32 \
+	hbziparch \
+	rddado \
 	xhb \
-#	examples \

-ifeq ($(HB_ARCHITECTURE),w32)
-DIRS += rddads
-ifneq ($(HB_COMPILER),rsxnt)
-DIRS += hbw32 hbodbc rddado
-endif
-endif
-
-ifeq ($(HB_ARCHITECTURE),os2)
-DIRS += hbgf/os2pm
-endif
-
-ifeq ($(HB_ARCHITECTURE),linux)
-DIRS += rddads hbodbc
-endif
+# contribs with external dependencies
+DIRS +=
+	hbapollo \
+	hbcurl \
+	hbfbird \
+	hbfimage \
+	hbgd \
+	hbhpdf \
+	hbmsql \
+	hbmysql \
+	hbpgsql \
+	rddads \

 ifneq ($(HB_CONTRIBLIBS),)
 DIRS += $(HB_CONTRIBLIBS)
 endif

+#DIRS += examples
+
 include $(ROOT)config/dir.cf
--- a/harbour/contrib/examples/Makefile
+++ b/harbour/contrib/examples/Makefile
@@ -9,5 +9,7 @@ DIRS=\
 	hscript \
 	misc \
 	pe \
+	pp \
+	rdddbt \

 include $(ROOT)config/dir.cf
--- a/harbour/contrib/hbapollo/make_b32.bat
+++ b/harbour/contrib/hbapollo/make_b32.bat
@@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbapollo/make_vc.bat
+++ b/harbour/contrib/hbapollo/make_vc.bat
@@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbcurl/make_b32.bat
+++ b/harbour/contrib/hbcurl/make_b32.bat
@@ -28,6 +28,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbcurl/make_vc.bat
+++ b/harbour/contrib/hbcurl/make_vc.bat
@@ -28,6 +28,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbfbird/make_b32.bat
+++ b/harbour/contrib/hbfbird/make_b32.bat
@@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbfbird/make_vc.bat
+++ b/harbour/contrib/hbfbird/make_vc.bat
@@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbfimage/make_b32.bat
+++ b/harbour/contrib/hbfimage/make_b32.bat
@@ -26,6 +26,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbfimage/make_vc.bat
+++ b/harbour/contrib/hbfimage/make_vc.bat
@@ -26,6 +26,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbgd/make_b32.bat
+++ b/harbour/contrib/hbgd/make_b32.bat
@@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbgd/make_vc.bat
+++ b/harbour/contrib/hbgd/make_vc.bat
@@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbgf/Makefile
+++ b/harbour/contrib/hbgf/Makefile
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+ROOT = ../../
+
+ifeq ($(HB_ARCHITECTURE),w32)
+DIRS = hbgfw32
+endif
+
+ifeq ($(HB_ARCHITECTURE),linux)
+DIRS = hbgfgtk
+endif
+
+ifeq ($(HB_ARCHITECTURE),os2)
+DIRS = hbgfos2
+endif
+
+include $(ROOT)config/dir.cf
--- a/harbour/contrib/hbgf/hbgfgtk/Makefile
+++ b/harbour/contrib/hbgf/hbgfgtk/Makefile
--- a/harbour/contrib/hbgf/hbgfgtk/button.prg
+++ b/harbour/contrib/hbgf/hbgfgtk/button.prg
--- a/harbour/contrib/hbgf/hbgfgtk/creabutt.c
+++ b/harbour/contrib/hbgf/hbgfgtk/creabutt.c
--- a/harbour/contrib/hbgf/hbgfgtk/creamenu.c
+++ b/harbour/contrib/hbgf/hbgfgtk/creamenu.c
--- a/harbour/contrib/hbgf/hbgfgtk/creawin.c
+++ b/harbour/contrib/hbgf/hbgfgtk/creawin.c
--- a/harbour/contrib/hbgf/hbgfgtk/dispatch.c
+++ b/harbour/contrib/hbgf/hbgfgtk/dispatch.c
--- a/harbour/contrib/hbgf/hbgfgtk/form.prg
+++ b/harbour/contrib/hbgf/hbgfgtk/form.prg
--- a/harbour/contrib/hbgf/hbgfgtk/general.c
+++ b/harbour/contrib/hbgf/hbgfgtk/general.c
--- a/harbour/contrib/hbgf/hbgfgtk/harbgtk.ch
+++ b/harbour/contrib/hbgf/hbgfgtk/harbgtk.ch
--- a/harbour/contrib/hbgf/hbgfgtk/harbgtk.h
+++ b/harbour/contrib/hbgf/hbgfgtk/harbgtk.h
--- a/harbour/contrib/hbgf/hbgfgtk/mainlgtk.c
+++ b/harbour/contrib/hbgf/hbgfgtk/mainlgtk.c
--- a/harbour/contrib/hbgf/hbgfgtk/menu.prg
+++ b/harbour/contrib/hbgf/hbgfgtk/menu.prg
--- a/harbour/contrib/hbgf/hbgfgtk/menuitem.prg
+++ b/harbour/contrib/hbgf/hbgfgtk/menuitem.prg
--- a/harbour/contrib/hbgf/hbgfgtk/msginfo.c
+++ b/harbour/contrib/hbgf/hbgfgtk/msginfo.c
--- a/harbour/contrib/hbgf/hbgfgtk/shared.ch
+++ b/harbour/contrib/hbgf/hbgfgtk/shared.ch
--- a/harbour/contrib/hbgf/hbgfgtk/winctrl.prg
+++ b/harbour/contrib/hbgf/hbgfgtk/winctrl.prg
--- a/harbour/contrib/hbgf/hbgfos2/Makefile
+++ b/harbour/contrib/hbgf/hbgfos2/Makefile
@@ -15,6 +15,6 @@ PRG_SOURCES=\
 	button.prg \
 	edit.prg \

-LIBNAME=hbgfos2pm
+LIBNAME=hbgfos2

 include $(TOP)$(ROOT)config/lib.cf
--- a/harbour/contrib/hbgf/hbgfos2/button.prg
+++ b/harbour/contrib/hbgf/hbgfos2/button.prg
--- a/harbour/contrib/hbgf/hbgfos2/edit.prg
+++ b/harbour/contrib/hbgf/hbgfos2/edit.prg
--- a/harbour/contrib/hbgf/hbgfos2/os2pm.c
+++ b/harbour/contrib/hbgf/hbgfos2/os2pm.c
--- a/harbour/contrib/hbgf/hbgfos2/os2pm.ch
+++ b/harbour/contrib/hbgf/hbgfos2/os2pm.ch
--- a/harbour/contrib/hbgf/hbgfos2/tform.prg
+++ b/harbour/contrib/hbgf/hbgfos2/tform.prg
--- a/harbour/contrib/hbgf/hbgfos2/tmenu.prg
+++ b/harbour/contrib/hbgf/hbgfos2/tmenu.prg
--- a/harbour/contrib/hbgf/hbgfos2/tmenuitm.prg
+++ b/harbour/contrib/hbgf/hbgfos2/tmenuitm.prg
--- a/harbour/contrib/hbgf/hbgfos2/winctrl.prg
+++ b/harbour/contrib/hbgf/hbgfos2/winctrl.prg
--- a/harbour/contrib/hbgf/hbgfw32/button.prg
+++ b/harbour/contrib/hbgf/hbgfw32/button.prg
--- a/harbour/contrib/hbgf/hbgfw32/common.mak
+++ b/harbour/contrib/hbgf/hbgfw32/common.mak
--- a/harbour/contrib/hbgf/hbgfw32/edit.prg
+++ b/harbour/contrib/hbgf/hbgfw32/edit.prg
--- a/harbour/contrib/hbgf/hbgfw32/form.prg
+++ b/harbour/contrib/hbgf/hbgfw32/form.prg
--- a/harbour/contrib/hbgf/hbgfw32/make_b32.bat
+++ b/harbour/contrib/hbgf/hbgfw32/make_b32.bat
--- a/harbour/contrib/hbgf/hbgfw32/make_vc.bat
+++ b/harbour/contrib/hbgf/hbgfw32/make_vc.bat
--- a/harbour/contrib/hbgf/hbgfw32/menu.prg
+++ b/harbour/contrib/hbgf/hbgfw32/menu.prg
--- a/harbour/contrib/hbgf/hbgfw32/menuitem.prg
+++ b/harbour/contrib/hbgf/hbgfw32/menuitem.prg
--- a/harbour/contrib/hbgf/hbgfw32/win32.c
+++ b/harbour/contrib/hbgf/hbgfw32/win32.c
--- a/harbour/contrib/hbgf/hbgfw32/win32.ch
+++ b/harbour/contrib/hbgf/hbgfw32/win32.ch
--- a/harbour/contrib/hbgf/hbgfw32/winctrl.prg
+++ b/harbour/contrib/hbgf/hbgfw32/winctrl.prg
--- a/harbour/contrib/hbhpdf/make_b32.bat
+++ b/harbour/contrib/hbhpdf/make_b32.bat
@@ -26,6 +26,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbhpdf/make_vc.bat
+++ b/harbour/contrib/hbhpdf/make_vc.bat
@@ -26,6 +26,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbmysql/make_b32.bat
+++ b/harbour/contrib/hbmysql/make_b32.bat
@@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbmysql/make_vc.bat
+++ b/harbour/contrib/hbmysql/make_vc.bat
@@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -3,6 +3,7 @@
 #

 ifneq ($(HB_WITHOUT_ODBC),yes)
+ifneq ($(HB_COMPILER),rsxnt)

 ROOT = ../../

@@ -21,3 +22,4 @@ LIBNAME=hbodbc
 include $(TOP)$(ROOT)config/lib.cf

 endif
+endif
--- a/harbour/contrib/hbpgsql/make_b32.bat
+++ b/harbour/contrib/hbpgsql/make_b32.bat
@@ -25,6 +25,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbpgsql/make_vc.bat
+++ b/harbour/contrib/hbpgsql/make_vc.bat
@@ -25,6 +25,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/hbw32/Makefile
+++ b/harbour/contrib/hbw32/Makefile
@@ -3,6 +3,7 @@
 #

 ifeq ($(HB_ARCHITECTURE),w32)
+ifneq ($(HB_COMPILER),rsxnt)

 ROOT = ../../

@@ -26,3 +27,4 @@ LIBNAME=hbw32
 include $(TOP)$(ROOT)config/lib.cf

 endif
+endif
--- a/harbour/contrib/rddado/Makefile
+++ b/harbour/contrib/rddado/Makefile
@@ -2,6 +2,9 @@
 # $Id$
 #

+# Needs hbw32 and hbodbc, but these won't build with rsxnt
+ifneq ($(HB_COMPILER),rsxnt)
+
 ROOT = ../../

 PRG_SOURCES= \
@@ -13,3 +16,5 @@ PRG_HEADERS=\
 LIBNAME=rddado

 include $(TOP)$(ROOT)config/lib.cf
+
+endif
--- a/harbour/contrib/rddads/make_b32.bat
+++ b/harbour/contrib/rddads/make_b32.bat
@@ -29,6 +29,8 @@ call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%
--- a/harbour/contrib/rddads/make_vc.bat
+++ b/harbour/contrib/rddads/make_vc.bat
@@ -29,6 +29,8 @@ call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9

 rem ---------------------------------------------------------------

+if "_HB_DLL_DIR" == "" goto POST_EXIT
+
 set _HB_INSTALL_PREFIX=%HB_INSTALL_PREFIX%
 if "%_HB_INSTALL_PREFIX%" == "" set _HB_INSTALL_PREFIX=..\..
 set _HB_LIB_INSTALL=%HB_LIB_INSTALL%