2010-07-22 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* contrib/make.hbs + contrib/pkglist + Changed to use external file to load the package list and package layout from. + Handling the case when .hbp filename has pathsep in it. + contrib/gtalleg/gtalleg.hbm * contrib/gtalleg/gtalleg.hbp * contrib/gtalleg/gtallegs.hbp + contrib/hbcurl/hbcurl.hbm * contrib/hbcurl/hbcurl.hbp * contrib/hbcurl/hbcurls.hbp + contrib/hbtip/hbtip.hbm * contrib/hbtip/hbtip.hbp * contrib/hbtip/hbtipssl.hbp + contrib/hbssl/hbssl.hbm * contrib/hbssl/hbssl.hbp * contrib/hbssl/hbssls.hbp + contrib/hbqt/hbqt.hbm * contrib/hbqt/hbqt.hbp * contrib/hbqt/hbqts.hbp + contrib/hbqt/gtqtc/gtqtc.hbm * contrib/hbqt/gtqtc/gtqtc.hbp * contrib/hbqt/gtqtc/gtqtcs.hbp * Moved common make settings to .hbm files instead of making internal reference to other .hbp file. * contrib/hbqt/hbqt_common.hbm + Added -hblib option. * contrib/hbqt/hbqtgui.hbp * contrib/hbqt/hbqtguis.hbp * contrib/hbqt/hbqtcore.hbp * contrib/hbqt/hbqtcores.hbp * contrib/hbqt/hbqtnetwork.hbp * contrib/hbqt/hbqtnetworks.hbp * contrib/hbqt/hbqscintilla/hbqscintilla.hbp + contrib/hbqt/qtwebkit/filelist.hbm * contrib/hbqt/qtwebkit/hbqtwebkits.hbp * contrib/hbqt/qtwebkit/hbqtwebkit.hbp + contrib/hbqt/qtdesigner/filelist.hbm * contrib/hbqt/qtdesigner/hbqtdesigner.hbp * contrib/hbqt/qtdesigner/hbqtdesigners.hbp * Delete references from .hbp files to other .hbp files. * Moved file lists into separate .hbm files.
2010-07-22 12:47:15 +00:00
parent 9b9abe5f5e
commit 66d5a12c2f
35 changed files with 416 additions and 306 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,54 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-07-22 14:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/make.hbs
+  + contrib/pkglist
+    + Changed to use external file to load the package
+      list and package layout from.
+    + Handling the case when .hbp filename has pathsep in it.
+
+  + contrib/gtalleg/gtalleg.hbm
+  * contrib/gtalleg/gtalleg.hbp
+  * contrib/gtalleg/gtallegs.hbp
+  + contrib/hbcurl/hbcurl.hbm
+  * contrib/hbcurl/hbcurl.hbp
+  * contrib/hbcurl/hbcurls.hbp
+  + contrib/hbtip/hbtip.hbm
+  * contrib/hbtip/hbtip.hbp
+  * contrib/hbtip/hbtipssl.hbp
+  + contrib/hbssl/hbssl.hbm
+  * contrib/hbssl/hbssl.hbp
+  * contrib/hbssl/hbssls.hbp
+  + contrib/hbqt/hbqt.hbm
+  * contrib/hbqt/hbqt.hbp
+  * contrib/hbqt/hbqts.hbp
+  + contrib/hbqt/gtqtc/gtqtc.hbm
+  * contrib/hbqt/gtqtc/gtqtc.hbp
+  * contrib/hbqt/gtqtc/gtqtcs.hbp
+    * Moved common make settings to .hbm files instead
+      of making internal reference to other .hbp file.
+
+  * contrib/hbqt/hbqt_common.hbm
+    + Added -hblib option.
+
+  * contrib/hbqt/hbqtgui.hbp
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtcore.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtnetwork.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+  + contrib/hbqt/qtwebkit/filelist.hbm
+  * contrib/hbqt/qtwebkit/hbqtwebkits.hbp
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+  + contrib/hbqt/qtdesigner/filelist.hbm
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+  * contrib/hbqt/qtdesigner/hbqtdesigners.hbp
+    * Delete references from .hbp files to other
+      .hbp files.
+    * Moved file lists into separate .hbm files.
+
 2010-07-22 10:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * src/rtl/gtcrs/gtcrs.c
    ! Fixed to build on Cygwin.
--- a/harbour/contrib/gtalleg/gtalleg.hbm
+++ b/harbour/contrib/gtalleg/gtalleg.hbm
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+
+-w3 -es2
+
+-stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm}
+
+-depkeyhead=allegro:allegro.h
+-depcontrol=allegro:${HB_WITH_ALLEGRO}
+-depincpath=allegro:/usr/include
+-depincpath=allegro:/opt/local/include
+-depimplibs=allegro:../bin/alleg42.dll
+
+gtalleg.c
+ssf.c
--- a/harbour/contrib/gtalleg/gtalleg.hbp
+++ b/harbour/contrib/gtalleg/gtalleg.hbp
@@ -2,21 +2,7 @@
 # $Id$
 #

-hblib
-inc
+gtalleg.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
-
-w3 -es2
-
-stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm}
-
-depkeyhead=allegro:allegro.h
-depcontrol=allegro:${HB_WITH_ALLEGRO}
-depincpath=allegro:/usr/include
-depincpath=allegro:/opt/local/include
-depimplibs=allegro:../bin/alleg42.dll
-
-gtalleg.c
-ssf.c
--- a/harbour/contrib/gtalleg/gtallegs.hbp
+++ b/harbour/contrib/gtalleg/gtallegs.hbp
@@ -2,13 +2,11 @@
 # $Id$
 #

-hblib
-
-gtalleg.hbp
-
-stop{!msvc}
+gtalleg.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+-stop{!msvc}
+
 -cflag=-DALLEGRO_STATICLINK
--- a/harbour/contrib/hbcurl/hbcurl.hbm
+++ b/harbour/contrib/hbcurl/hbcurl.hbm
@@ -0,0 +1,16 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+
+-w3 -es2
+
+-depkeyhead=curl:curl/curl.h
+-depcontrol=curl:${HB_WITH_CURL}
+-depincpath=curl:/usr/include
+
+-instfile=inc:hbcurl.ch
+
+hbcurl.c
--- a/harbour/contrib/hbcurl/hbcurl.hbp
+++ b/harbour/contrib/hbcurl/hbcurl.hbp
@@ -2,22 +2,12 @@
 # $Id$
 #

-hblib
-inc
+hbcurl.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

-w3 -es2
-
-depkeyhead=curl:curl/curl.h
-depcontrol=curl:${HB_WITH_CURL}
-depincpath=curl:/usr/include
 -depimplibs=curl:../libcurl.dll
 -depimplibs=curl:../bin/libcurl.dll

 -iflag={bcc}-a
-
-instfile=inc:hbcurl.ch
-
-hbcurl.c
--- a/harbour/contrib/hbcurl/hbcurls.hbp
+++ b/harbour/contrib/hbcurl/hbcurls.hbp
@@ -2,13 +2,11 @@
 # $Id$
 #

-hblib
-
-stop{!(win|wce)}
-
-hbcurl.hbp
+hbcurl.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+-stop{!(win|wce)}
+
 -cflag=-DCURL_STATICLIB
--- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbm
+++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbm
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+../hbqt_common.hbm
+
+-instfile=inc:hbgtqtc.ch
+
+gtqtc.cpp
+gtqtc.h
--- a/harbour/contrib/hbqt/gtqtc/gtqtc.hbp
+++ b/harbour/contrib/hbqt/gtqtc/gtqtc.hbp
@@ -2,12 +2,7 @@
 # $Id$
 #

-../hbqt_common.hbm
+gtqtc.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
-
-instfile=inc:hbgtqtc.ch
-
-gtqtc.cpp
-gtqtc.h
--- a/harbour/contrib/hbqt/gtqtc/gtqtcs.hbp
+++ b/harbour/contrib/hbqt/gtqtc/gtqtcs.hbp
@@ -2,11 +2,11 @@
 # $Id$
 #

-stop{!HB_QT_STATIC}
-
-gtqtc.hbp
+gtqtc.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+-stop{!HB_QT_BUILD_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
@@ -2,8 +2,6 @@
 # $Id$
 #

-hblib
-
 ../hbqt_common.hbm

 -o${hb_name}
--- a/harbour/contrib/hbqt/hbqt.hbm
+++ b/harbour/contrib/hbqt/hbqt.hbm
@@ -0,0 +1,37 @@
+#
+# $Id$
+#
+
+hbqt_common.hbm
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-instfile=inc:hbqt.ch
+
+hbqt_base.cpp
+hbqt_destruct.cpp
+hbqt_hbqabstractitemmodel.cpp
+hbqt_hbdbfmodel.cpp
+hbqt_hbevents.cpp
+hbqt_hbqmainwindow.cpp
+hbqt_hbqplaintextedit.cpp
+hbqt_hbqsyntaxhighlighter.cpp
+hbqt_hbqtableview.cpp
+hbqt_hbslots.cpp
+hbqt_utils.cpp
+hbqt_misc.prg
+hbqt_errorsys.prg
+THbQtUI.prg
+
+hbqt_hbqabstractitemmodel.h
+hbqt_hbdbfmodel.h
+hbqt_hbevents.h
+hbqt_hbqmainwindow.h
+hbqt_hbqplaintextedit.h
+hbqt_hbqsyntaxhighlighter.h
+hbqt_hbqtableview.h
+hbqt_hbslots.h
+
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
+{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtNetwork.framework/Headers
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -2,38 +2,7 @@
 # $Id$
 #

-hblib
-
-hbqt_common.hbm
+hbqt.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
-
-instfile=inc:hbqt.ch
-
-hbqt_base.cpp
-hbqt_destruct.cpp
-hbqt_hbqabstractitemmodel.cpp
-hbqt_hbdbfmodel.cpp
-hbqt_hbevents.cpp
-hbqt_hbqmainwindow.cpp
-hbqt_hbqplaintextedit.cpp
-hbqt_hbqsyntaxhighlighter.cpp
-hbqt_hbqtableview.cpp
-hbqt_hbslots.cpp
-hbqt_utils.cpp
-hbqt_misc.prg
-hbqt_errorsys.prg
-THbQtUI.prg
-
-hbqt_hbqabstractitemmodel.h
-hbqt_hbdbfmodel.h
-hbqt_hbevents.h
-hbqt_hbqmainwindow.h
-hbqt_hbqplaintextedit.h
-hbqt_hbqsyntaxhighlighter.h
-hbqt_hbqtableview.h
-hbqt_hbslots.h
-
-{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtGui.framework/Headers
-{darwin&!HB_WITH_QT}-cflag=-I/Library/Frameworks/QtNetwork.framework/Headers
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -2,6 +2,9 @@
 # $Id$
 #

+# Common settings for all hbqt subcomponents
+
+-hblib
 -inc

 -w3 -es2
--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -2,8 +2,6 @@
 # $Id$
 #

-hblib
-
 hbqt_common.hbm

 -o${hb_name}
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,13 +2,13 @@
 # $Id$
 #

-stop{!HB_QT_BUILD_STATIC|!allwin}
-
-hbqtcore.hbp
-
-hblib
+hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+qtcore/filelist.hbm
+
+-stop{!HB_QT_BUILD_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -2,8 +2,6 @@
 # $Id$
 #

-hblib
-
 hbqt_common.hbm

 -o${hb_name}
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,13 +2,13 @@
 # $Id$
 #

-stop{!HB_QT_BUILD_STATIC|!allwin}
-
-hblib
-
-hbqtgui.hbp
+hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+qtgui/filelist.hbm
+
+-stop{!HB_QT_BUILD_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -2,8 +2,6 @@
 # $Id$
 #

-hblib
-
 hbqt_common.hbm

 -o${hb_name}
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,13 +2,13 @@
 # $Id$
 #

-stop{!HB_QT_BUILD_STATIC|!allwin}
-
-hbqtnetwork.hbp
-
-hblib
+hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+qtnetwork/filelist.hbm
+
+-stop{!HB_QT_BUILD_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,13 +2,11 @@
 # $Id$
 #

-stop{!HB_QT_BUILD_STATIC|!allwin}
-
-hbqt.hbp
-
-hblib
+hbqt.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+-stop{!HB_QT_BUILD_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/qtdesigner/filelist.hbm
+++ b/harbour/contrib/hbqt/qtdesigner/filelist.hbm
@@ -0,0 +1,21 @@
+#
+# $Id$
+#
+
+QDesignerActionEditorInterface.cpp
+QDesignerFormEditorInterface.cpp
+QDesignerFormWindowCursorInterface.cpp
+QDesignerFormWindowInterface.cpp
+QDesignerFormWindowManagerInterface.cpp
+QDesignerObjectInspectorInterface.cpp
+QDesignerPropertyEditorInterface.cpp
+QDesignerWidgetBoxInterface.cpp
+
+TQDesignerActionEditorInterface.prg
+TQDesignerFormEditorInterface.prg
+TQDesignerFormWindowCursorInterface.prg
+TQDesignerFormWindowInterface.prg
+TQDesignerFormWindowManagerInterface.prg
+TQDesignerObjectInspectorInterface.prg
+TQDesignerPropertyEditorInterface.prg
+TQDesignerWidgetBoxInterface.prg
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
@@ -2,27 +2,9 @@
 # $Id$
 #

-hblib
-
 ../hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

-QDesignerActionEditorInterface.cpp
-QDesignerFormEditorInterface.cpp
-QDesignerFormWindowCursorInterface.cpp
-QDesignerFormWindowInterface.cpp
-QDesignerFormWindowManagerInterface.cpp
-QDesignerObjectInspectorInterface.cpp
-QDesignerPropertyEditorInterface.cpp
-QDesignerWidgetBoxInterface.cpp
-
-TQDesignerActionEditorInterface.prg
-TQDesignerFormEditorInterface.prg
-TQDesignerFormWindowCursorInterface.prg
-TQDesignerFormWindowInterface.prg
-TQDesignerFormWindowManagerInterface.prg
-TQDesignerObjectInspectorInterface.prg
-TQDesignerPropertyEditorInterface.prg
-TQDesignerWidgetBoxInterface.prg
+filelist.hbm
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigners.hbp
@@ -2,11 +2,13 @@
 # $Id$
 #

-stop{!HB_QT_STATIC|!allwin}
-
-hbqtdesigner.hbp
+../hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+filelist.hbm
+
+-stop{!HB_QT_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/qtwebkit/filelist.hbm
+++ b/harbour/contrib/hbqt/qtwebkit/filelist.hbm
@@ -0,0 +1,25 @@
+#
+# $Id$
+#
+
+QWebFrame.cpp
+QWebHistory.cpp
+QWebHistoryInterface.cpp
+QWebHistoryItem.cpp
+QWebHitTestResult.cpp
+QWebPage.cpp
+QWebPluginFactory.cpp
+QWebSecurityOrigin.cpp
+QWebSettings.cpp
+QWebView.cpp
+
+TQWebFrame.prg
+TQWebHistory.prg
+TQWebHistoryInterface.prg
+TQWebHistoryItem.prg
+TQWebHitTestResult.prg
+TQWebPage.prg
+TQWebPluginFactory.prg
+TQWebSecurityOrigin.prg
+TQWebSettings.prg
+TQWebView.prg
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
@@ -2,31 +2,9 @@
 # $Id$
 #

-hblib
-
 ../hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

-QWebFrame.cpp
-QWebHistory.cpp
-QWebHistoryInterface.cpp
-QWebHistoryItem.cpp
-QWebHitTestResult.cpp
-QWebPage.cpp
-QWebPluginFactory.cpp
-QWebSecurityOrigin.cpp
-QWebSettings.cpp
-QWebView.cpp
-
-TQWebFrame.prg
-TQWebHistory.prg
-TQWebHistoryInterface.prg
-TQWebHistoryItem.prg
-TQWebHitTestResult.prg
-TQWebPage.prg
-TQWebPluginFactory.prg
-TQWebSecurityOrigin.prg
-TQWebSettings.prg
-TQWebView.prg
+filelist.hbm
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkits.hbp
@@ -2,11 +2,13 @@
 # $Id$
 #

-stop{!HB_QT_STATIC|!allwin}
-
-hbqtwebkit.hbp
+../hbqt_common.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+filelist.hbm
+
+-stop{!HB_QT_STATIC|!allwin}
+
 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbssl/hbssl.hbm
+++ b/harbour/contrib/hbssl/hbssl.hbm
@@ -0,0 +1,45 @@
+#
+# $Id$
+#
+
+-stop{wce}
+
+-hblib
+-inc
+
+-w3 -es2
+
+-depkeyhead=openssl:openssl/ssl.h
+-depcontrol=openssl:${HB_WITH_OPENSSL}
+-depincpath=openssl:/usr/include
+-depincpath=openssl:/usr/local/include
+-depincpath=openssl:/usr/local/ssl/include
+-depincpath=openssl:/boot/common/include
+
+{darwin}-cflag=-DOPENSSL_NO_SHA256
+{darwin}-cflag=-DOPENSSL_NO_SHA512
+{darwin}-cflag=-DOPENSSL_NO_CAMELLIA
+{darwin}-cflag=-DOPENSSL_NO_SEED
+{darwin}-cflag=-DOPENSSL_NO_DGRAM
+{darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
+
+# Patent will expire in 2010/2011
+-cflag=-DOPENSSL_NO_IDEA
+
+-instfile=inc:hbssl.ch
+
+hbssl.c
+bio.c
+err.c
+evp.c
+evpciph.c
+evpenc.c
+evpmd.c
+evppkey.c
+pem.c
+rand.c
+ssl.c
+sslciph.c
+sslctx.c
+sslsess.c
+x509.c
--- a/harbour/contrib/hbssl/hbssl.hbp
+++ b/harbour/contrib/hbssl/hbssl.hbp
@@ -2,22 +2,11 @@
 # $Id$
 #

-stop{wce}
-
-hblib
-inc
+hbssl.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

-w3 -es2
-
-depkeyhead=openssl:openssl/ssl.h
-depcontrol=openssl:${HB_WITH_OPENSSL}
-depincpath=openssl:/usr/include
-depincpath=openssl:/usr/local/include
-depincpath=openssl:/usr/local/ssl/include
-depincpath=openssl:/boot/common/include
 -depimplibs=openssl:../out32dll/libeay32.dll
 -depimplibs=openssl:../out32dll/ssleay32.dll
 -depimplibs=openssl:../dll/libeay32.dll
@@ -26,31 +15,3 @@
 -depimplibs=openssl:../ssleay32.dll

 -iflag={bcc}-a
-
-{darwin}-cflag=-DOPENSSL_NO_SHA256
-{darwin}-cflag=-DOPENSSL_NO_SHA512
-{darwin}-cflag=-DOPENSSL_NO_CAMELLIA
-{darwin}-cflag=-DOPENSSL_NO_SEED
-{darwin}-cflag=-DOPENSSL_NO_DGRAM
-{darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
-
-# Patent will expire in 2010/2011
-cflag=-DOPENSSL_NO_IDEA
-
-instfile=inc:hbssl.ch
-
-hbssl.c
-bio.c
-err.c
-evp.c
-evpciph.c
-evpenc.c
-evpmd.c
-evppkey.c
-pem.c
-rand.c
-ssl.c
-sslciph.c
-sslctx.c
-sslsess.c
-x509.c
--- a/harbour/contrib/hbssl/hbssls.hbp
+++ b/harbour/contrib/hbssl/hbssls.hbp
@@ -2,13 +2,11 @@
 # $Id$
 #

-hblib
-
-stop{!(win|wce)}
-
-hbssl.hbp
+hbssl.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

+-stop{!(win|wce)}
+
 {win|wce}-cflag=-DHB_OPENSSL_STATIC
--- a/harbour/contrib/hbtip/hbtip.hbm
+++ b/harbour/contrib/hbtip/hbtip.hbm
@@ -0,0 +1,33 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+
+-w3 -es2
+
+-instfile=inc:tip.ch
+-instfile=inc:thtml.ch
+
+encb64c.c
+encurlc.c
+utils.c
+
+cgi.prg
+client.prg
+credent.prg
+encb64.prg
+encoder.prg
+encqp.prg
+encurl.prg
+ftpcli.prg
+httpcli.prg
+log.prg
+mail.prg
+popcli.prg
+sendmail.prg
+sessid.prg
+smtpcli.prg
+thtml.prg
+url.prg
--- a/harbour/contrib/hbtip/hbtip.hbp
+++ b/harbour/contrib/hbtip/hbtip.hbp
@@ -2,35 +2,7 @@
 # $Id$
 #

-hblib
-inc
+hbtip.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
-
-w3 -es2
-
-instfile=inc:tip.ch
-instfile=inc:thtml.ch
-
-encb64c.c
-encurlc.c
-utils.c
-
-cgi.prg
-client.prg
-credent.prg
-encb64.prg
-encoder.prg
-encqp.prg
-encurl.prg
-ftpcli.prg
-httpcli.prg
-log.prg
-mail.prg
-popcli.prg
-sendmail.prg
-sessid.prg
-smtpcli.prg
-thtml.prg
-url.prg
--- a/harbour/contrib/hbtip/hbtipssl.hbp
+++ b/harbour/contrib/hbtip/hbtipssl.hbp
@@ -2,9 +2,7 @@
 # $Id$
 #

-hblib
-
-hbtip.hbp
+hbtip.hbm

 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
--- a/harbour/contrib/make.hbs
+++ b/harbour/contrib/make.hbs
@@ -29,83 +29,25 @@

 /* TODO:
     1. normalize path to hbpre/hbpost to save on cmdline
-     2. clean this source to avoid redundancy
-     3. solve HB_BUILD_CONTRIB_DLL support the .dlls are either
+     2. solve HB_BUILD_CONTRIB_DLL support the .dlls are either
        huge, or they don't link.
-     4. hbmk2 location detection in standalone mode
+     3. hbmk2 location detection in standalone mode
        (or move hbmk2 to core lib?)
-     5. Move in external libs to contrib area? (bz2, minizip, sqlite3)
-     6. Pull the list of .hbp files from an external file
-        (so it can be used in stdalone mode, and the script can be
-        moved to bin and used in more generic way f.e. for examples
-        and local projects)
-     7. 'install' is ignored in stdalone mode. It would be needed to
+     4. Move in external libs to contrib area? (bz2, minizip, sqlite3)
+     5. 'install' is ignored in stdalone mode. It would be needed to
        replicate the install dir defaulting logic found in global.mk
        to implement it.
-     8. Delete header install related logic from GNU Make system,
+     6. Delete header install related logic from GNU Make system,
        also delete doc/*.txt install related logic (easily replacable
        with postinst.hbs logic)
-     9. Move some logic to hbmk2.
-    10. Honor paths found in --hbinfo hbctree{{}} section.
+     7. Move some logic to hbmk2.
+     8. Honor paths found in --hbinfo hbctree{{}} section.
+     9. pkglist should not contain information about package layout.
+        This should rather be somehow embedded into .hbp files.
 */

 #pragma warninglevel=3

-/* ----------------------------------------------------------------------- */
-
-STATIC s_hPackageList := {;
-   "gtalleg"       => { "gtalleg.hbp", "gtallegs.hbp" },;
-   "gtwvg"         => { "gtwvg.hbp"                   },;
-   "hbblat"        => { "hbblat.hbp"                  },;
-   "hbblink"       => { "hbblink.hbp"                 },;
-   "hbbz2"         => { "hbbz2.hbp"                   },; /* uses: bz2 (external) */
-   "hbcairo"       => { "hbcairo.hbp"                 },;
-   "hbclipsm"      => { "hbclipsm.hbp"                },;
-   "hbcomm"        => { "hbcomm.hbp"                  },;
-   "hbct"          => { "hbct.hbp"                    },;
-   "hbcups"        => { "hbcups.hbp"                  },;
-   "hbcurl"        => { "hbcurl.hbp", "hbcurls.hbp"   },;
-   "hbdoc2"        => { "hbdoc2.hbp"                  },;
-   "hbfbird"       => { "hbfbird.hbp"                 },;
-   "hbfimage"      => { "hbfimage.hbp"                },;
-   "hbfoxpro"      => { "hbfoxpro.hbp"                },;
-   "hbfship"       => { "hbfship.hbp"                 },;
-   "hbgd"          => { "hbgd.hbp"                    },;
-   "hbgt"          => { "hbgt.hbp"                    },;
-   "hbhpdf"        => { "hbhpdf.hbp"                  },;
-   "hbide"         => { "hbide.hbp"                   },;
-   "hbmemio"       => { "hbmemio.hbp"                 },;
-   "hbmisc"        => { "hbmisc.hbp"                  },;
-   "hbmysql"       => { "hbmysql.hbp"                 },;
-   "hbmzip"        => { "hbmzip.hbp"                  },; /* uses: minizip (external) */
-   "hbnetio"       => { "hbnetio.hbp"                 },;
-   "hbnetio/utils" => { "hbnetio.hbp"                 },;
-   "hbnf"          => { "hbnf.hbp"                    },;
-   "hbodbc"        => { "hbodbc.hbp"                  },;
-   "hbpgsql"       => { "hbpgsql.hbp"                 },;
-   "hbqt"          => { "hbqt.hbp", "hbqts.hbp", "hbqtcore.hbp", "hbqtcores.hbp", "hbqtgui.hbp", "hbqtguis.hbp", "hbqtnetwork.hbp", "hbqtnetworks.hbp" },;
-   "hbsms"         => { "hbsms.hbp"                   },;
-   "hbsqlit3"      => { "hbsqlit3.hbp"                },; /* uses: sqlite3 (external) */
-   "hbssl"         => { "hbssl.hbp", "hbssls.hbp"     },;
-   "hbtip"         => { "hbtip.hbp", "hbtipssl.hbp"   },;
-   "hbtpathy"      => { "hbtpathy.hbp"                },;
-   "hbwin"         => { "hbwin.hbp"                   },;
-   "hbxbp"         => { "hbxbp.hbp"                   },;
-   "hbxpp"         => { "hbxpp.hbp"                   },;
-   "hbziparc"      => { "hbziparc.hbp"                },;
-   "rddads"        => { "rddads.hbp"                  },;
-   "rddbmcdx"      => { "rddbmcdx.hbp"                },;
-   "rddsql"        => { "rddsql.hbp"                  },;
-   "sddfb"         => { "sddfb.hbp"                   },;
-   "sddmy"         => { "sddmy.hbp"                   },;
-   "sddoci"        => { "sddoci.hbp"                  },;
-   "sddodbc"       => { "sddodbc.hbp"                 },;
-   "sddpg"         => { "sddpg.hbp"                   },;
-   "sddsqlt3"      => { "sddsqlt3.hbp"                },; /* uses: sqlite3 (external) */
-   "xhb"           => { "xhb.hbp"                     }}
-
-/* ----------------------------------------------------------------------- */
-
 /* TOFIX: Ugly hack to avoid #include "directry.ch" */
 #define F_NAME                  1       /* File name */
 #define F_ATTR                  5       /* File attribute */
@@ -126,9 +68,9 @@ STATIC s_cHome
 STATIC s_cRoot
 STATIC s_lTest

+STATIC s_hPackageList
+
 PROCEDURE Main( ... )
-   LOCAL aProject
-   LOCAL tmp

   SetCancel( .F. )

@@ -142,13 +84,9 @@ PROCEDURE Main( ... )
      hb_setenv( "_HB_BUILD_MIGR", "yes" )
   ENDIF

-   /* Convert list of contribs */
+   /* Load list of packages */

-   FOR EACH aProject IN s_hPackageList
-      FOR EACH tmp IN aProject
-         tmp := { "cFileName" => tmp }
-      NEXT
-   NEXT
+   s_hPackageList := LoadPkgList( s_cHome + "pkglist" )

   /* Build */

@@ -348,7 +286,7 @@ PROCEDURE GNUMake( ... )
   FOR EACH cItem IN hb_ATokens( GetEnv( "HB_BUILD_ADDONS" ),, .T. )
      IF ! Empty( cItem )
         hb_FNameSplit( PathSepToSelf( cItem ), @cDir, @cName )
-         s_hPackageList[ StrTran( DirDelPathSep( cDir ), "\", "/" ) ] := { "cFileName" => cName }
+         s_hPackageList[ StrTran( DirDelPathSep( cDir ), "\", "/" ) ] := { "cFileName" => StrTran( cName, "\", "/" ) }
         lAnyAddons := .T.
      ENDIF
   NEXT
@@ -627,6 +565,16 @@ STATIC FUNCTION FNameExtSet( cFileName, cExt )

   RETURN hb_FNameMerge( cDir, cName, cExt )

+STATIC FUNCTION FNameExtDef( cFileName, cDefExt )
+   LOCAL cDir, cName, cExt
+
+   hb_FNameSplit( cFileName, @cDir, @cName, @cExt )
+   IF Empty( cExt )
+      cExt := cDefExt
+   ENDIF
+
+   RETURN hb_FNameMerge( cDir, cName, cExt )
+
 STATIC FUNCTION DirGetName( cDir )
   LOCAL cName

@@ -744,3 +692,36 @@ STATIC FUNCTION TopoSort( aEdgeList )
   NEXT

   RETURN aList
+
+FUNCTION LoadPkgList( cFileName )
+
+   LOCAL cFile := MemoRead( cFileName )
+   LOCAL cLine
+   LOCAL aItem
+   LOCAL xItem
+
+   LOCAL cPackageName
+   LOCAL hPackageList := { => }
+
+   hb_HKeepOrder( hPackageList, .T. )
+
+   cFile := StrTran( cFile, Chr( 13 ) )
+
+   FOR EACH cLine IN hb_ATokens( cFile, Chr( 10 ) )
+      IF "#" $ cLine
+         cLine := Left( cLine, At( "#", cLine ) - 1 )
+      ENDIF
+      IF ! Empty( cLine )
+         aItem := hb_ATokens( AllTrim( cLine ) )
+         IF Len( aItem ) >= 2
+            cPackageName := aItem[ 1 ]
+            hb_ADel( aItem, 1, .T. )
+            FOR EACH xItem IN aItem
+               xItem := { "cFileName" => FNameExtDef( StrTran( xItem, "\", "/" ), ".hbp" ) }
+            NEXT
+            hPackageList[ cPackageName ] := AClone( aItem )
+         ENDIF
+      ENDIF
+   NEXT
+
+   RETURN hPackageList
--- a/harbour/contrib/pkglist
+++ b/harbour/contrib/pkglist
@@ -0,0 +1,53 @@
+#
+# $Id$
+#
+
+gtalleg       gtalleg.hbp gtallegs.hbp
+gtwvg         gtwvg.hbp
+hbblat        hbblat.hbp
+hbblink       hbblink.hbp
+hbbz2         hbbz2.hbp               # uses: bz2 (external)
+hbcairo       hbcairo.hbp
+hbclipsm      hbclipsm.hbp
+hbcomm        hbcomm.hbp
+hbct          hbct.hbp
+hbcups        hbcups.hbp
+hbcurl        hbcurl.hbp hbcurls.hbp
+hbdoc2        hbdoc2.hbp
+hbfbird       hbfbird.hbp
+hbfimage      hbfimage.hbp
+hbfoxpro      hbfoxpro.hbp
+hbfship       hbfship.hbp
+hbgd          hbgd.hbp
+hbgt          hbgt.hbp
+hbhpdf        hbhpdf.hbp
+hbide         hbide.hbp
+hbmemio       hbmemio.hbp
+hbmisc        hbmisc.hbp
+hbmysql       hbmysql.hbp
+hbmzip        hbmzip.hbp              # uses: minizip (external)
+hbnetio       hbnetio.hbp
+hbnetio/utils hbnetio.hbp
+hbnf          hbnf.hbp
+hbodbc        hbodbc.hbp
+hbpgsql       hbpgsql.hbp
+hbqt          hbqt.hbp hbqts.hbp hbqtcore.hbp hbqtcores.hbp hbqtgui.hbp hbqtguis.hbp hbqtnetwork.hbp hbqtnetworks.hbp
+hbsms         hbsms.hbp
+hbsqlit3      hbsqlit3.hbp            # uses: sqlite3 (external)
+hbssl         hbssl.hbp hbssls.hbp
+hbtip         hbtip.hbp hbtipssl.hbp
+hbtpathy      hbtpathy.hbp
+hbwin         hbwin.hbp
+hbxbp         hbxbp.hbp
+hbxpp         hbxpp.hbp
+hbziparc      hbziparc.hbp
+rddads        rddads.hbp
+rddbmcdx      rddbmcdx.hbp
+rddsql        rddsql.hbp
+sddfb         sddfb.hbp
+sddmy         sddmy.hbp
+sddoci        sddoci.hbp
+sddodbc       sddodbc.hbp
+sddpg         sddpg.hbp
+sddsqlt3      sddsqlt3.hbp            # uses: sqlite3 (external)
+xhb           xhb.hbp