From 50f20fcb9644fbf53424abd3e6f7e052c0ba4ea5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 6 Feb 2000 23:37:56 +0000 Subject: [PATCH] 20000207-00:25 GMT+1 Victor Szakats --- harbour/ChangeLog | 7 +++++ harbour/ngdoc/bldfthe.bat | 2 +- harbour/ngdoc/ft_helpc.prg | 64 ++++++++++++++++++++------------------ harbour/ngdoc/makefile | 4 +-- 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5ad890720d..e16cb0f483 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -9,6 +9,13 @@ * Mousereg renamed to regs. * Makefile ! Formatting fix. + * ngdoc/Makefile + ! Fixed. + * ngdoc/bldfthe.bat + ngdoc/ft_helpc.prg + ! NANFOR is always defined if __HARBOUR__, so that it now links OK with + the GNU make system. Explicit /DNANFOR switch removed from the Borland + make .BAT file. 20000206-20:35 GMT -3 Luiz Rafael Culik *Makefile diff --git a/harbour/ngdoc/bldfthe.bat b/harbour/ngdoc/bldfthe.bat index d621a8f226..f7e9f35337 100644 --- a/harbour/ngdoc/bldfthe.bat +++ b/harbour/ngdoc/bldfthe.bat @@ -3,6 +3,6 @@ rem rem $Id$ rem -..\bin\harbour %1 %2 /n /iinclude /DNANFOR /p +..\bin\harbour %1 %2 /n /iinclude /p bcc32 -e%1.exe -O2 -M -v -I..\include -L..\lib\b32 harbour.lib terminal.lib hbpp.lib hbgt.lib common.lib ..\lib\b32\rdd.lib %1.c rem del %1.c diff --git a/harbour/ngdoc/ft_helpc.prg b/harbour/ngdoc/ft_helpc.prg index fea9659afb..24f420b797 100644 --- a/harbour/ngdoc/ft_helpc.prg +++ b/harbour/ngdoc/ft_helpc.prg @@ -2,6 +2,37 @@ * $Id$ */ +/* + * Harbour Project source code: + * Ft_helpC document Extractoy + * + * Copyright 2000 Luiz Rafael Culik + * www - http://www.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 of the License, or + * (at your option) any later version, with one exception: + * + * The exception is that if you link the Harbour Runtime Library (HRL) + * and/or the Harbour Virtual Machine (HVM) 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 HRL + * and/or HVM code into it. + * + * 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 program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit + * their web site at http://www.gnu.org/). + * + */ + /* * File......: FT_HELPC.PRG * Author....: Luiz Rafael Culik @@ -61,36 +92,9 @@ * Fixed the help text when ft_helpc is called with out any parameter */ -/* - * Harbour Project source code: - * Ft_helpC document Extractoy - * - * Copyright 2000 Luiz Rafael Culik - * www - http://www.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 of the License, or - * (at your option) any later version, with one exception: - * - * The exception is that if you link the Harbour Runtime Library (HRL) - * and/or the Harbour Virtual Machine (HVM) 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 HRL - * and/or HVM code into it. - * - * 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 program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit - * their web site at http://www.gnu.org/). - * - */ +#ifdef __HARBOUR__ + #define NANFOR +#endif #include "directry.ch" #include "fileio.ch" diff --git a/harbour/ngdoc/makefile b/harbour/ngdoc/makefile index f0503161b8..2aecc15112 100644 --- a/harbour/ngdoc/makefile +++ b/harbour/ngdoc/makefile @@ -3,10 +3,10 @@ # ifeq ($(HB_MAIN),) - HB_MAIN = std + HB_MAIN = std endif -ROOT = ../../ +ROOT = ../ PRG_SOURCES=\ ft_helpc.prg