From e7a4f9d9af727f57a9d854ee377e4983fb7a5ac2 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 5 Feb 2011 09:16:09 +0000 Subject: [PATCH] 2011-02-05 10:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - contrib/hbct/ctextern.prg * contrib/hbct/hbct.hbp - contrib/hbxbp/hbxbpext.prg * contrib/hbxbp/hbxbp.hbp - contrib/hbwin/hbwinext.prg * contrib/hbwin/hbwin.hbp * contrib/hbqt/qtgui/hbqtgui.hbm - contrib/hbqt/qtgui/hbqt_extern.prg * contrib/hbqt/qtwebkit/hbqtwebkit.hbm - contrib/hbqt/qtwebkit/hbqt_extern.prg - contrib/hbqt/qtcore/hbqt_extern.prg * contrib/hbqt/qtcore/hbqtcore.hbm - contrib/hbqt/qtnetwork/hbqt_extern.prg * contrib/hbqt/qtnetwork/hbqtnetwork.hbm - contrib/hbqt/qtuitools/hbqt_extern.prg * contrib/hbqt/qtuitools/hbqtuitools.hbm - contrib/hbqt/qscintilla/hbqt_extern.prg * contrib/hbqt/qscintilla/hbqscintilla.hbm - contrib/hbqt/qtdesigner/hbqt_extern.prg * contrib/hbqt/qtdesigner/hbqtdesigner.hbm - contrib/rddads/adsextrn.prg * contrib/rddads/rddads.hbp - contrib/hbgd/gdextern.prg * contrib/hbgd/hbgd.hbp % Deleted separate puller modules and added .hbx to the project directly. ; TODO: Some wrapper projects have the name already used for .c files, so .hbx cannot be directly included ATM. ; TODO: Move -D__HBEXTREQ__ to local .hbp files so they kick in in stdalone mode too. Or maybe hbmk2 should always define it, if there is an .hbx file included in a project, after all it can generate these .hbx files, too. * contrib/hbmxml/hbmxmlx.prg * contrib/hblzf/hblzfx.prg * contrib/hbxdiff/hbxdiffx.prg * contrib/hbexpat/hbexpatx.prg % Deleted some lines no more necessary. * contrib/xhb/xhb.hbp * contrib/hbxpp/hbxpp.hbp + Added .hbx puller to projects. --- harbour/ChangeLog | 58 ++++++++++++++++--- harbour/contrib/hbct/ctextern.prg | 55 ------------------ harbour/contrib/hbct/hbct.hbp | 3 +- harbour/contrib/hbexpat/hbexpatx.prg | 2 - harbour/contrib/hbgd/gdextern.prg | 55 ------------------ harbour/contrib/hbgd/hbgd.hbp | 3 +- harbour/contrib/hblzf/hblzfx.prg | 2 - harbour/contrib/hbmxml/hbmxmlx.prg | 2 - .../contrib/hbqt/qscintilla/hbqscintilla.hbm | 4 +- .../contrib/hbqt/qscintilla/hbqt_extern.prg | 18 ------ harbour/contrib/hbqt/qtcore/hbqt_extern.prg | 18 ------ harbour/contrib/hbqt/qtcore/hbqtcore.hbm | 3 +- .../contrib/hbqt/qtdesigner/hbqt_extern.prg | 18 ------ .../contrib/hbqt/qtdesigner/hbqtdesigner.hbm | 4 +- harbour/contrib/hbqt/qtgui/hbqt_extern.prg | 18 ------ harbour/contrib/hbqt/qtgui/hbqtgui.hbm | 3 +- .../contrib/hbqt/qtnetwork/hbqt_extern.prg | 18 ------ .../contrib/hbqt/qtnetwork/hbqtnetwork.hbm | 4 +- .../contrib/hbqt/qtuitools/hbqt_extern.prg | 18 ------ .../contrib/hbqt/qtuitools/hbqtuitools.hbm | 4 +- harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg | 18 ------ harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm | 4 +- harbour/contrib/hbwin/hbwin.hbp | 2 +- harbour/contrib/hbwin/hbwinext.prg | 55 ------------------ harbour/contrib/hbxbp/hbxbp.hbp | 3 +- harbour/contrib/hbxbp/hbxbpext.prg | 12 ---- harbour/contrib/hbxdiff/hbxdiffx.prg | 2 - harbour/contrib/hbxpp/hbxpp.hbp | 2 + harbour/contrib/rddads/adsextrn.prg | 55 ------------------ harbour/contrib/rddads/rddads.hbp | 3 +- harbour/contrib/xhb/xhb.hbp | 2 + 31 files changed, 77 insertions(+), 391 deletions(-) delete mode 100644 harbour/contrib/hbct/ctextern.prg delete mode 100644 harbour/contrib/hbgd/gdextern.prg delete mode 100644 harbour/contrib/hbqt/qscintilla/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtcore/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtgui/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtuitools/hbqt_extern.prg delete mode 100644 harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg delete mode 100644 harbour/contrib/hbwin/hbwinext.prg delete mode 100644 harbour/contrib/hbxbp/hbxbpext.prg delete mode 100644 harbour/contrib/rddads/adsextrn.prg diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 140df2fbe0..b65b6d165d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,48 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-05 10:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + - contrib/hbct/ctextern.prg + * contrib/hbct/hbct.hbp + - contrib/hbxbp/hbxbpext.prg + * contrib/hbxbp/hbxbp.hbp + - contrib/hbwin/hbwinext.prg + * contrib/hbwin/hbwin.hbp + * contrib/hbqt/qtgui/hbqtgui.hbm + - contrib/hbqt/qtgui/hbqt_extern.prg + * contrib/hbqt/qtwebkit/hbqtwebkit.hbm + - contrib/hbqt/qtwebkit/hbqt_extern.prg + - contrib/hbqt/qtcore/hbqt_extern.prg + * contrib/hbqt/qtcore/hbqtcore.hbm + - contrib/hbqt/qtnetwork/hbqt_extern.prg + * contrib/hbqt/qtnetwork/hbqtnetwork.hbm + - contrib/hbqt/qtuitools/hbqt_extern.prg + * contrib/hbqt/qtuitools/hbqtuitools.hbm + - contrib/hbqt/qscintilla/hbqt_extern.prg + * contrib/hbqt/qscintilla/hbqscintilla.hbm + - contrib/hbqt/qtdesigner/hbqt_extern.prg + * contrib/hbqt/qtdesigner/hbqtdesigner.hbm + - contrib/rddads/adsextrn.prg + * contrib/rddads/rddads.hbp + - contrib/hbgd/gdextern.prg + * contrib/hbgd/hbgd.hbp + % Deleted separate puller modules and added .hbx to the project directly. + ; TODO: Some wrapper projects have the name already used for .c files, + so .hbx cannot be directly included ATM. + ; TODO: Move -D__HBEXTREQ__ to local .hbp files so they kick in in stdalone mode too. + Or maybe hbmk2 should always define it, if there is an .hbx file included + in a project, after all it can generate these .hbx files, too. + + * contrib/hbmxml/hbmxmlx.prg + * contrib/hblzf/hblzfx.prg + * contrib/hbxdiff/hbxdiffx.prg + * contrib/hbexpat/hbexpatx.prg + % Deleted some lines no more necessary. + + * contrib/xhb/xhb.hbp + * contrib/hbxpp/hbxpp.hbp + + Added .hbx puller to projects. + 2011-02-05 09:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg * config/hbextern.hbs @@ -69755,26 +69797,26 @@ -> wce/mingawrm -> wce/poccarm -> wce/msvcarm - -> dos/djgpp (using DOS GNU make. it fails with mingw32-make due to cmdline length limit) + -> dos/djgpp (using DOS GNU make. it fails with mingw32-make due to cmdline length limit) -> dos/watcom -> os2/watcom -> linux/watcom on dos hosts: - -> win/watcom (*) - -> os2/watcom (*) - -> linux/watcom (*) + -> win/watcom (*) + -> os2/watcom (*) + -> linux/watcom (*) on os2 hosts: -> win/watcom - -> dos/watcom (*) - -> linux/watcom (*) + -> dos/watcom (*) + -> linux/watcom (*) on linux hosts: -> wce/mingwarm -> win/mingw -> win/watcom - -> dos/watcom (fails due to wlink bug) + -> dos/watcom (fails due to wlink bug) -> os2/watcom on darwin/bsd/hpux/sunos hosts: - -> win/mingw (*, on FreeBSD cross-build was created successfully) + -> win/mingw (*, on FreeBSD cross-build was created successfully) (*): Theoretically possible, but not heard of such build yet. diff --git a/harbour/contrib/hbct/ctextern.prg b/harbour/contrib/hbct/ctextern.prg deleted file mode 100644 index c0f2cc2a01..0000000000 --- a/harbour/contrib/hbct/ctextern.prg +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * extern puller - * - * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) - * www - http://harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#define __HBEXTERN__HBCT__ANNOUNCE -#define __HBEXTERN__HBCT__REQUEST -#include "hbct.hbx" diff --git a/harbour/contrib/hbct/hbct.hbp b/harbour/contrib/hbct/hbct.hbp index 2e854c56ca..0a6342ac95 100644 --- a/harbour/contrib/hbct/hbct.hbp +++ b/harbour/contrib/hbct/hbct.hbp @@ -23,6 +23,8 @@ -instfile=inc:ctvideo.ch -instfile=inc:hbct.hbx +hbct.hbx + addascii.c asciisum.c ascpos.c @@ -109,7 +111,6 @@ wordtoch.c ct.prg ctdummy.prg -ctextern.prg ctmisc.prg ctrand.prg cttime.prg diff --git a/harbour/contrib/hbexpat/hbexpatx.prg b/harbour/contrib/hbexpat/hbexpatx.prg index da43383d44..b782f43ff8 100644 --- a/harbour/contrib/hbexpat/hbexpatx.prg +++ b/harbour/contrib/hbexpat/hbexpatx.prg @@ -50,6 +50,4 @@ * */ -#define __HBEXTERN__HBEXPAT__ANNOUNCE -#define __HBEXTERN__HBEXPAT__REQUEST #include "hbexpat.hbx" diff --git a/harbour/contrib/hbgd/gdextern.prg b/harbour/contrib/hbgd/gdextern.prg deleted file mode 100644 index 2320420d35..0000000000 --- a/harbour/contrib/hbgd/gdextern.prg +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Extern puller - * - * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) - * www - http://harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#define __HBEXTERN__HBGD__ANNOUNCE -#define __HBEXTERN__HBGD__REQUEST -#include "hbgd.hbx" diff --git a/harbour/contrib/hbgd/hbgd.hbp b/harbour/contrib/hbgd/hbgd.hbp index 7e404fafe4..e68ecbc484 100644 --- a/harbour/contrib/hbgd/hbgd.hbp +++ b/harbour/contrib/hbgd/hbgd.hbp @@ -24,11 +24,12 @@ -instfile=inc:gdextern.ch -instfile=inc:hbgd.hbx +hbgd.hbx + gdwrp.c gd.prg gdbar.prg gdchart.prg gdimage.prg -gdextern.prg gdbarcod.prg diff --git a/harbour/contrib/hblzf/hblzfx.prg b/harbour/contrib/hblzf/hblzfx.prg index 993ca9c938..555398a62e 100644 --- a/harbour/contrib/hblzf/hblzfx.prg +++ b/harbour/contrib/hblzf/hblzfx.prg @@ -50,6 +50,4 @@ * */ -#define __HBEXTERN__HBLZF__ANNOUNCE -#define __HBEXTERN__HBLZF__REQUEST #include "hblzf.hbx" diff --git a/harbour/contrib/hbmxml/hbmxmlx.prg b/harbour/contrib/hbmxml/hbmxmlx.prg index 9b3329a1bb..6ad0e35246 100644 --- a/harbour/contrib/hbmxml/hbmxmlx.prg +++ b/harbour/contrib/hbmxml/hbmxmlx.prg @@ -50,6 +50,4 @@ * */ -#define __HBEXTERN__HBMXML__ANNOUNCE -#define __HBEXTERN__HBMXML__REQUEST #include "hbmxml.hbx" diff --git a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm index 3ccd003b98..ee98f42a4b 100644 --- a/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm +++ b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm @@ -6,12 +6,12 @@ qth/filelist.hbm +hbqscintilla.hbx + hbqt_init.cpp hbqt_hbqsciscintilla.cpp hbqt_hbqsciscintilla.h -hbqt_extern.prg - ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qscintilla/hbqt_extern.prg b/harbour/contrib/hbqt/qscintilla/hbqt_extern.prg deleted file mode 100644 index e84c0b31a6..0000000000 --- a/harbour/contrib/hbqt/qscintilla/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQSCINTILLA_EXTERN_CH -#define __HBQSCINTILLA_EXTERN_CH - -#define __HBEXTERN__HBQSCINTILLA__ANNOUNCE -#define __HBEXTERN__HBQSCINTILLA__REQUEST -#include "hbqscintilla.hbx" - -#endif /* __HBQSCINTILLA_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtcore/hbqt_extern.prg b/harbour/contrib/hbqt/qtcore/hbqt_extern.prg deleted file mode 100644 index 7e0d669be1..0000000000 --- a/harbour/contrib/hbqt/qtcore/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTCORE_EXTERN_CH -#define __HBQTCORE_EXTERN_CH - -#define __HBEXTERN__HBQTCORE__ANNOUNCE -#define __HBEXTERN__HBQTCORE__REQUEST -#include "hbqtcore.hbx" - -#endif /* __HBQTCORE_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm index 33c9198a08..33eb16514b 100644 --- a/harbour/contrib/hbqt/qtcore/hbqtcore.hbm +++ b/harbour/contrib/hbqt/qtcore/hbqtcore.hbm @@ -6,6 +6,8 @@ qth/filelist.hbm +hbqtcore.hbx + hbqt_init.cpp hbqt_pointer.cpp hbqt_version.cpp @@ -14,7 +16,6 @@ hbqt_hbqevents.cpp hbqt_hbqslots.cpp hbqt_hbqstring.cpp -hbqt_extern.prg hbqt_misc.prg hbqt_hbqevents.h diff --git a/harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg b/harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg deleted file mode 100644 index c159145a5b..0000000000 --- a/harbour/contrib/hbqt/qtdesigner/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTDESIGNER_EXTERN_CH -#define __HBQTDESIGNER_EXTERN_CH - -#define __HBEXTERN__HBQTDESIGNER__ANNOUNCE -#define __HBEXTERN__HBQTDESIGNER__REQUEST -#include "hbqtdesigner.hbx" - -#endif /* __HBQTDESIGNER_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm index 16b8913a3e..bc148034f5 100644 --- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm +++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbm @@ -8,9 +8,9 @@ qth/filelist.hbm -hbqt_init.cpp +hbqtdesigner.hbx -hbqt_extern.prg +hbqt_init.cpp ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbqt/qtgui/hbqt_extern.prg b/harbour/contrib/hbqt/qtgui/hbqt_extern.prg deleted file mode 100644 index 73079f980b..0000000000 --- a/harbour/contrib/hbqt/qtgui/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTGUI_EXTERN_CH -#define __HBQTGUI_EXTERN_CH - -#define __HBEXTERN__HBQTGUI__ANNOUNCE -#define __HBEXTERN__HBQTGUI__REQUEST -#include "hbqtgui.hbx" - -#endif /* __HBQTGUI_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm index bfe077e598..0d48b1486f 100644 --- a/harbour/contrib/hbqt/qtgui/hbqtgui.hbm +++ b/harbour/contrib/hbqt/qtgui/hbqtgui.hbm @@ -6,6 +6,8 @@ qth/filelist.hbm +hbqtgui.hbx + hbqt_hbqabstractitemmodel.cpp hbqt_hbqgraphicsitem.cpp hbqt_hbqgraphicsscene.cpp @@ -22,7 +24,6 @@ hbqt_hbqsyntaxhighlighter.h hbqt_hbqtableview.h hbqt_errorsys.prg -hbqt_extern.prg THbQtUI.prg diff --git a/harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg b/harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg deleted file mode 100644 index e12fda1a97..0000000000 --- a/harbour/contrib/hbqt/qtnetwork/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTNETWORK_EXTERN_CH -#define __HBQTNETWORK_EXTERN_CH - -#define __HBEXTERN__HBQTNETWORK__ANNOUNCE -#define __HBEXTERN__HBQTNETWORK__REQUEST -#include "hbqtnetwork.hbx" - -#endif /* __HBQTNETWORK_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm index 72e541d5c8..32e1ef1057 100644 --- a/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm +++ b/harbour/contrib/hbqt/qtnetwork/hbqtnetwork.hbm @@ -6,8 +6,8 @@ qth/filelist.hbm +hbqtnetwork.hbx + hbqt_init.cpp -hbqt_extern.prg - ../qtcore/hbqtcore.hbc diff --git a/harbour/contrib/hbqt/qtuitools/hbqt_extern.prg b/harbour/contrib/hbqt/qtuitools/hbqt_extern.prg deleted file mode 100644 index eac4818785..0000000000 --- a/harbour/contrib/hbqt/qtuitools/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTUITOOLS_EXTERN_CH -#define __HBQTUITOOLS_EXTERN_CH - -#define __HBEXTERN__HBQTUITOOLS__ANNOUNCE -#define __HBEXTERN__HBQTUITOOLS__REQUEST -#include "hbqtuitools.hbx" - -#endif /* __HBQTUITOOLS_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm index 94b55e26c5..d7d9e1ce28 100644 --- a/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm +++ b/harbour/contrib/hbqt/qtuitools/hbqtuitools.hbm @@ -6,9 +6,9 @@ qth/filelist.hbm -hbqt_init.cpp +hbqtuitools.hbx -hbqt_extern.prg +hbqt_init.cpp THbQtUILoader.prg diff --git a/harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg b/harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg deleted file mode 100644 index fc6c7014b0..0000000000 --- a/harbour/contrib/hbqt/qtwebkit/hbqt_extern.prg +++ /dev/null @@ -1,18 +0,0 @@ -/* - * $Id$ - */ - -/* -------------------------------------------------------------------- */ -/* WARNING: Automatically generated source file. DO NOT EDIT! */ -/* Instead, edit corresponding .qth file, */ -/* or the generator tool itself, and run regenarate. */ -/* -------------------------------------------------------------------- */ - -#ifndef __HBQTWEBKIT_EXTERN_CH -#define __HBQTWEBKIT_EXTERN_CH - -#define __HBEXTERN__HBQTWEBKIT__ANNOUNCE -#define __HBEXTERN__HBQTWEBKIT__REQUEST -#include "hbqtwebkit.hbx" - -#endif /* __HBQTWEBKIT_EXTERN_CH */ diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm index 21428518a7..5df18caeda 100644 --- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm +++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbm @@ -6,9 +6,9 @@ qth/filelist.hbm -hbqt_init.cpp +hbqtwebkit.hbx -hbqt_extern.prg +hbqt_init.cpp ../qtcore/hbqtcore.hbc ../qtgui/hbqtgui.hbc diff --git a/harbour/contrib/hbwin/hbwin.hbp b/harbour/contrib/hbwin/hbwin.hbp index 6c4152e555..01852e51ee 100644 --- a/harbour/contrib/hbwin/hbwin.hbp +++ b/harbour/contrib/hbwin/hbwin.hbp @@ -25,7 +25,7 @@ -instfile=inc:hbwinole.h -instfile=inc:hbwin.ch -hbwinext.prg +hbwin.hbx axcore.c legacycd.c diff --git a/harbour/contrib/hbwin/hbwinext.prg b/harbour/contrib/hbwin/hbwinext.prg deleted file mode 100644 index 2e21c30b48..0000000000 --- a/harbour/contrib/hbwin/hbwinext.prg +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * extern puller - * - * Copyright 2011 Viktor Szakats (harbour.01 syenar.hu) - * www - http://harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#define __HBEXTERN__HBWIN__ANNOUNCE -#define __HBEXTERN__HBWIN__REQUEST -#include "hbwin.hbx" diff --git a/harbour/contrib/hbxbp/hbxbp.hbp b/harbour/contrib/hbxbp/hbxbp.hbp index c2d519c71a..9ac9822df0 100644 --- a/harbour/contrib/hbxbp/hbxbp.hbp +++ b/harbour/contrib/hbxbp/hbxbp.hbp @@ -18,7 +18,8 @@ -instfile=inc:xbpdev.ch -instfile=inc:hbxbp.hbx -hbxbpext.prg +hbxbp.hbx + hbpprocess.prg xbp3state.prg xbpappevent.prg diff --git a/harbour/contrib/hbxbp/hbxbpext.prg b/harbour/contrib/hbxbp/hbxbpext.prg deleted file mode 100644 index 90d04538af..0000000000 --- a/harbour/contrib/hbxbp/hbxbpext.prg +++ /dev/null @@ -1,12 +0,0 @@ -/* - * $Id$ - */ - -#ifndef __HBXBP_EXTERN_CH -#define __HBXBP_EXTERN_CH - -#define __HBEXTERN__HBXBP__ANNOUNCE -#define __HBEXTERN__HBXBP__REQUEST -#include "hbxbp.hbx" - -#endif /* __HBXBP_EXTERN_CH */ diff --git a/harbour/contrib/hbxdiff/hbxdiffx.prg b/harbour/contrib/hbxdiff/hbxdiffx.prg index 726d9c2e1f..0a22069ff7 100644 --- a/harbour/contrib/hbxdiff/hbxdiffx.prg +++ b/harbour/contrib/hbxdiff/hbxdiffx.prg @@ -50,6 +50,4 @@ * */ -#define __HBEXTERN__HBXDIFF__ANNOUNCE -#define __HBEXTERN__HBXDIFF__REQUEST #include "hbxdiff.hbx" diff --git a/harbour/contrib/hbxpp/hbxpp.hbp b/harbour/contrib/hbxpp/hbxpp.hbp index c3801ac985..93d13fc125 100644 --- a/harbour/contrib/hbxpp/hbxpp.hbp +++ b/harbour/contrib/hbxpp/hbxpp.hbp @@ -16,6 +16,8 @@ -instfile=inc:thread.ch -instfile=inc:hbxpp.hbx +hbxpp.hbx + binnumx.c dbcmdx.c dbdetacx.c diff --git a/harbour/contrib/rddads/adsextrn.prg b/harbour/contrib/rddads/adsextrn.prg deleted file mode 100644 index 2718616f8b..0000000000 --- a/harbour/contrib/rddads/adsextrn.prg +++ /dev/null @@ -1,55 +0,0 @@ -/* - * $Id$ - */ - -/* - * Harbour Project source code: - * Extern puller - * - * Copyright 2010 Viktor Szakats (harbour.01 syenar.hu) - * www - http://harbour-project.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). - * - * As a special exception, the Harbour Project gives permission for - * additional uses of the text contained in its release of Harbour. - * - * The exception is that, if you link the Harbour libraries with other - * files to produce an executable, this does not by itself cause the - * resulting executable to be covered by the GNU General Public License. - * Your use of that executable is in no way restricted on account of - * linking the Harbour library code into it. - * - * This exception does not however invalidate any other reasons why - * the executable file might be covered by the GNU General Public License. - * - * This exception applies only to the code released by the Harbour - * Project under the name Harbour. If you copy code from other - * Harbour Project or Free Software Foundation releases into a copy of - * Harbour, as the General Public License permits, the exception does - * not apply to the code that you add in this way. To avoid misleading - * anyone as to the status of such modified files, you must delete - * this exception notice from them. - * - * If you write modifications of your own for Harbour, it is your choice - * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - * - */ - -#define __HBEXTERN__RDDADS__ANNOUNCE -#define __HBEXTERN__RDDADS__REQUEST -#include "rddads.hbx" diff --git a/harbour/contrib/rddads/rddads.hbp b/harbour/contrib/rddads/rddads.hbp index f9a2683a6f..0403de68d4 100644 --- a/harbour/contrib/rddads/rddads.hbp +++ b/harbour/contrib/rddads/rddads.hbp @@ -24,8 +24,9 @@ -instfile=inc:adsextrn.ch -instfile=inc:rddads.hbx +rddads.hbx + ads1.c adsfunc.c adsmgmnt.c adsx.c -adsextrn.prg diff --git a/harbour/contrib/xhb/xhb.hbp b/harbour/contrib/xhb/xhb.hbp index 185541ae2e..21bed13480 100644 --- a/harbour/contrib/xhb/xhb.hbp +++ b/harbour/contrib/xhb/xhb.hbp @@ -24,6 +24,8 @@ ../hbtip/hbtip.hbc ../hbwin/hbwin.hbc +xhb.hbx + bkgtsks.c cstructc.c datesxhb.c