fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-30 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* contrib/gtwvg/Makefile
   * contrib/hbapollo/Makefile
   * contrib/hbbtree/Makefile
   * contrib/hbclipsm/Makefile
   * contrib/hbct/Makefile
   * contrib/hbfbird/Makefile
   * contrib/hbfimage/Makefile
   * contrib/hbgd/Makefile
   * contrib/hbhpdf/Makefile
   * contrib/hbmisc/Makefile
   * contrib/hbmsql/Makefile
   * contrib/hbmysql/Makefile
   * contrib/hbmzip/Makefile
   * contrib/hbnf/Makefile
   * contrib/hbodbc/Makefile
   * contrib/hbpgsql/Makefile
   * contrib/hbsqlit2/Makefile
   * contrib/hbsqlit3/Makefile
   * contrib/hbtip/Makefile
   * contrib/hbtpathy/Makefile
   * contrib/hbvpdf/Makefile
   * contrib/hbw32/Makefile
   * contrib/hbw32ddr/Makefile
   * contrib/hbwhat32/Makefile
   * contrib/rddado/Makefile
   * contrib/rddads/Makefile
     ! CFLAGS -> C_USR
     * var = var + x -> var += x
     ! Added header install rules for all places where such 
       headers are defined. I wonder why isn't this the default 
       in our GNU-make system.
     * few other minor cleanups.

   * contrib/rddads/Makefile
     * Experimenting with HB_INC_ADS implementation in GNU-make system.
       HB_INC_ADS can now used to enable to rddads builds.
       In GNU-make HB_INC_ADS can contain a list of possible places 
       where headers may be found. GNU-make will validate these and 
       if the headers were found in any of these places, rddads will 
       be built. For Linux there are some default dirs which will 
       always be checked.
       'HB_WITHOUT_ADS' and 'ACE_DIRS' is not longer used.
     ; Please test. If this works out okay, we can use this method 
       for the rest of 3rd party dependent contribs.

   * contrib/rddads/Makefile
     % Don't define WIN32 in GNU-makefiles for w32.

   * contrib/hbmisc/Makefile
     ! Don't include non-existing 'test' dir in make.

   * contrib/gtwvg/Makefile
   * contrib/gtwvg/common.mak
     ! Not installing private .h file to common include dir.

   * contrib/hbw32ddr/w32_ddrw.cpp
     ! Fixed one GCC warning. (Some remain)
This commit is contained in:
Viktor Szakats
2008-06-30 08:25:46 +00:00
parent 0a69f3201d
commit 2749fe224a
29 changed files with 180 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
harbour/ChangeLog
View File

@@ -8,6 +8,65 @@
2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-06-30 10:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
* contrib/gtwvg/Makefile
* contrib/hbapollo/Makefile
* contrib/hbbtree/Makefile
* contrib/hbclipsm/Makefile
* contrib/hbct/Makefile
* contrib/hbfbird/Makefile
* contrib/hbfimage/Makefile
* contrib/hbgd/Makefile
* contrib/hbhpdf/Makefile
* contrib/hbmisc/Makefile
* contrib/hbmsql/Makefile
* contrib/hbmysql/Makefile
* contrib/hbmzip/Makefile
* contrib/hbnf/Makefile
* contrib/hbodbc/Makefile
* contrib/hbpgsql/Makefile
* contrib/hbsqlit2/Makefile
* contrib/hbsqlit3/Makefile
* contrib/hbtip/Makefile
* contrib/hbtpathy/Makefile
* contrib/hbvpdf/Makefile
* contrib/hbw32/Makefile
* contrib/hbw32ddr/Makefile
* contrib/hbwhat32/Makefile
* contrib/rddado/Makefile
* contrib/rddads/Makefile
! CFLAGS -> C_USR
* var = var + x -> var += x
! Added header install rules for all places where such
headers are defined. I wonder why isn't this the default
in our GNU-make system.
* few other minor cleanups.
* contrib/rddads/Makefile
* Experimenting with HB_INC_ADS implementation in GNU-make system.
HB_INC_ADS can now used to enable to rddads builds.
In GNU-make HB_INC_ADS can contain a list of possible places
where headers may be found. GNU-make will validate these and
if the headers were found in any of these places, rddads will
be built. For Linux there are some default dirs which will
always be checked.
'HB_WITHOUT_ADS' and 'ACE_DIRS' is not longer used.
; Please test. If this works out okay, we can use this method
for the rest of 3rd party dependent contribs.
* contrib/rddads/Makefile
% Don't define WIN32 in GNU-makefiles for w32.
* contrib/hbmisc/Makefile
! Don't include non-existing 'test' dir in make.
* contrib/gtwvg/Makefile
* contrib/gtwvg/common.mak
! Not installing private .h file to common include dir.
* contrib/hbw32ddr/w32_ddrw.cpp
! Fixed one GCC warning. (Some remain)
2008-06-28 11:37 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/gtwvg/gtwvg.c
* contrib/gtwvg/gtwvg.h

8
harbour/contrib/gtwvg/Makefile
View File

@@ -11,9 +11,6 @@ C_SOURCES=\
wvgcore.c \
wvgutils.c \
C_HEADERS=\
gtwvg.h \
PRG_SOURCES=\
wvgclass.prg \
wvgpaint.prg \
@@ -24,6 +21,11 @@ PRG_HEADERS=\
LIBNAME=gtwvg
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

3
harbour/contrib/gtwvg/common.mak
View File

@@ -6,9 +6,6 @@ LIBNAME = $(LIBPREF)gtwvg
LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
C_HEADERS=\
gtwvg.h \
PRG_HEADERS=\
hbgtwvg.ch \
wvtwin.ch \

5
harbour/contrib/hbapollo/Makefile
View File

@@ -17,6 +17,11 @@ PRG_HEADERS=\
LIBNAME=hbapollo
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

5
harbour/contrib/hbbtree/Makefile
View File

@@ -18,4 +18,9 @@ PRG_HEADERS=\
LIBNAME=hbbtree
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbclipsm/Makefile
View File

@@ -21,4 +21,9 @@ PRG_HEADERS=\
LIBNAME=hbclipsm
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbct/Makefile
View File

@@ -110,4 +110,9 @@ PRG_HEADERS=\
LIBNAME=hbct
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

2
harbour/contrib/hbfbird/Makefile
View File

@@ -4,7 +4,7 @@
ROOT = ../../
CFLAGS += -I/opt/firebird/include
C_USR += -I/opt/firebird/include
C_SOURCES=\
firebird.c \

5
harbour/contrib/hbfimage/Makefile
View File

@@ -15,4 +15,9 @@ PRG_HEADERS=\
LIBNAME=hbfimage
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

7
harbour/contrib/hbgd/Makefile
View File

@@ -20,11 +20,7 @@ PRG_SOURCES=\
LIBNAME=hbgd
ifeq ($(HB_COMPILER),mingw32)
CFLAGS := $(CFLAGS) -I/usr/include
else
CFLAGS := $(CFLAGS) -I/usr/include
endif
C_USR += -I/usr/include
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
@@ -32,4 +28,3 @@ include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

2
harbour/contrib/hbhpdf/Makefile
View File

@@ -14,7 +14,7 @@ PRG_SOURCES=\
LIBNAME=hbhpdf
CFLAGS := $(CFLAGS) -I/usr/include
C_USR += -I/usr/include
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)

3
harbour/contrib/hbmisc/Makefile
View File

@@ -21,7 +21,4 @@ PRG_SOURCES=\
LIBNAME=hbmisc
DIRS=test
include $(TOP)$(ROOT)config/lib.cf
#include $(TOP)$(ROOT)config/dir.cf

5
harbour/contrib/hbmsql/Makefile
View File

@@ -15,4 +15,9 @@ PRG_HEADERS=\
LIBNAME=hbmsql
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

11
harbour/contrib/hbmysql/Makefile
View File

@@ -16,8 +16,13 @@ PRG_HEADERS=\
LIBNAME=hbmysql
include $(TOP)$(ROOT)config/lib.cf
# a workaround of a problem with different include directories
# for mysql header files between different unix distributions
CFLAGS := -I/usr/include/mysql -DBIG_JOINS=1
C_USR += -I/usr/include/mysql -DBIG_JOINS=1
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbmzip/Makefile
View File

@@ -15,4 +15,9 @@ PRG_HEADERS=\
LIBNAME=hbmzip
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbnf/Makefile
View File

@@ -152,4 +152,9 @@ PRG_HEADERS=\
LIBNAME=hbnf
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbodbc/Makefile
View File

@@ -19,7 +19,12 @@ PRG_HEADERS=\
LIBNAME=hbodbc
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif
endif

11
harbour/contrib/hbpgsql/Makefile
View File

@@ -16,8 +16,13 @@ PRG_HEADERS=\
LIBNAME=hbpgsql
include $(TOP)$(ROOT)config/lib.cf
PG_DIRS = /usr/local/pgsql/include /usr/local/pgsql/include/libpq \
/usr/include/pgsql /usr/include/postgresql /postgres/include
CFLAGS += $(foreach d, $(PG_DIRS), $(if $(wildcard $(d)/libpq-fe.h),-I$(d),))
C_USR += $(foreach d, $(PG_DIRS), $(if $(wildcard $(d)/libpq-fe.h),-I$(d),))
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbsqlit2/Makefile
View File

@@ -43,4 +43,9 @@ PRG_HEADERS=\
LIBNAME=hbsqlit2
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbsqlit3/Makefile
View File

@@ -12,4 +12,9 @@ PRG_HEADERS=\
LIBNAME=hbsqlit3
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbtip/Makefile
View File

@@ -35,6 +35,11 @@ PRG_HEADERS= \
LIBNAME=hbtip
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

5
harbour/contrib/hbtpathy/Makefile
View File

@@ -33,6 +33,11 @@ PRG_HEADERS=\
LIBNAME=hbtpathy
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

5
harbour/contrib/hbvpdf/Makefile
View File

@@ -14,4 +14,9 @@ PRG_HEADERS=\
LIBNAME=hbvpdf
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)

5
harbour/contrib/hbw32/Makefile
View File

@@ -24,7 +24,12 @@ PRG_HEADERS = \
LIBNAME=hbw32
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif
endif

2
harbour/contrib/hbw32ddr/Makefile
View File

@@ -18,6 +18,6 @@ LIBNAME=hbw32ddr
include $(TOP)$(ROOT)config/lib.cf
CFLAGS := $(CFLAGS) -I.
C_USR += -I.
endif

2
harbour/contrib/hbw32ddr/w32_ddrw.cpp
View File

@@ -763,7 +763,7 @@ HB_FUNC( DD_MSGBOX )
else
m2 = deftitle;
MessageBox( hb_dd_g_DDHwnd, m1, m2, NULL);
MessageBox( hb_dd_g_DDHwnd, m1, m2, 0 );
}
//------------------------------------------------------------------//

7
harbour/contrib/hbwhat32/Makefile
View File

@@ -85,8 +85,13 @@ LIBNAME=hbwhat32
# This lib needs xhb headers to compile, and this is
# the hack to help Harbour find them.
PRG_USR := $(PRG_USR) -I../../../xhb
PRG_USR += -I../../../xhb
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

5
harbour/contrib/rddado/Makefile
View File

@@ -15,6 +15,11 @@ PRG_HEADERS=\
LIBNAME=rddado
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf
install::
$(INSTALL_RULE_HEADERS)
endif

19
harbour/contrib/rddads/Makefile
View File

@@ -2,7 +2,15 @@
# $Id$
#
ifneq ($(HB_WITHOUT_ADS),yes)
ifeq ($(HB_ARCHITECTURE),linux)
HB_INC_ADS = /usr/local/ads/acesdk $(HOME)/ads/acesdk
endif
HB_INC_ADS_OK += $(foreach d, $(HB_INC_ADS), $(if $(wildcard $(d)/ace.h),$(d),))
ifneq ($(HB_INC_ADS_OK),)
C_USR += $(foreach d, $(HB_INC_ADS_OK), -I$(d))
ROOT = ../../
@@ -16,15 +24,6 @@ PRG_HEADERS=\
LIBNAME=rddads
ifeq ($(HB_ARCHITECTURE),w32)
C_USR += -DWIN32
endif
ifeq ($(ACE_DIRS),)
export ACE_DIRS = /usr/local $(HOME)
C_USR += $(foreach d, $(ACE_DIRS), $(if $(wildcard $(d)/ads/acesdk/ace.h),-I$(d)/ads/acesdk,))
endif
include $(TOP)$(ROOT)config/header.cf
INSTALL_RULE_HEADERS := $(INSTALL_RULE)
include $(TOP)$(ROOT)config/lib.cf