2010-09-07 09:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/contrib/hbmysql/hbmysql.hbp * harbour/contrib/gtalleg/gtalleg.hbm * harbour/contrib/sddmy/sddmy.hbp * harbour/contrib/hbodbc/hbodbc.hbp * harbour/contrib/sddfb/sddfb.hbp * harbour/contrib/hbsqlit3/hbsqlit3.hbp * harbour/contrib/hbmzip/hbmzip.hbp * harbour/contrib/hbqt/hbqt_common.hbc * harbour/contrib/hbfbird/hbfbird.hbp * harbour/contrib/sddpg/sddpg.hbp * harbour/contrib/hbbz2/hbbz2.hbp * harbour/contrib/hbcurl/hbcurl.hbm * harbour/contrib/hbcups/hbcups.hbp * harbour/contrib/hbhpdf/hbhpdf.hbp * harbour/contrib/hbpgsql/hbpgsql.hbp * harbour/contrib/sddsqlt3/sddsqlt3.hbp * harbour/contrib/hbfimage/hbfimage.hbp * harbour/contrib/sddodbc/sddodbc.hbp * harbour/contrib/hbgd/hbgd.hbp * harbour/contrib/sddoci/sddoci.hbp * harbour/contrib/hbwin/hbwin.hbp * harbour/contrib/hbcairo/hbcairo.hbp * harbour/contrib/hbssl/hbssl.hbm * updated to respect HB_BUILD_EXTDEF=no setting and automatic switching to locally hosted external libraries (if available) Thanks to Viktor for the proposed solution. * harbour/config/c.mk * harbour/config/rules.mk + added rules to compile .s files by GCC. I will need it for serial port support in DJGPP builds.
2010-09-07 07:16:51 +00:00
parent 2775f662f2
commit f188bd8d9e
26 changed files with 82 additions and 1 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,39 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-09-07 09:16 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbmysql/hbmysql.hbp
+  * harbour/contrib/gtalleg/gtalleg.hbm
+  * harbour/contrib/sddmy/sddmy.hbp
+  * harbour/contrib/hbodbc/hbodbc.hbp
+  * harbour/contrib/sddfb/sddfb.hbp
+  * harbour/contrib/hbsqlit3/hbsqlit3.hbp
+  * harbour/contrib/hbmzip/hbmzip.hbp
+  * harbour/contrib/hbqt/hbqt_common.hbc
+  * harbour/contrib/hbfbird/hbfbird.hbp
+  * harbour/contrib/sddpg/sddpg.hbp
+  * harbour/contrib/hbbz2/hbbz2.hbp
+  * harbour/contrib/hbcurl/hbcurl.hbm
+  * harbour/contrib/hbcups/hbcups.hbp
+  * harbour/contrib/hbhpdf/hbhpdf.hbp
+  * harbour/contrib/hbpgsql/hbpgsql.hbp
+  * harbour/contrib/sddsqlt3/sddsqlt3.hbp
+  * harbour/contrib/hbfimage/hbfimage.hbp
+  * harbour/contrib/sddodbc/sddodbc.hbp
+  * harbour/contrib/hbgd/hbgd.hbp
+  * harbour/contrib/sddoci/sddoci.hbp
+  * harbour/contrib/hbwin/hbwin.hbp
+  * harbour/contrib/hbcairo/hbcairo.hbp
+  * harbour/contrib/hbssl/hbssl.hbm
+    * updated to respect HB_BUILD_EXTDEF=no setting and automatic
+      switching to locally hosted external libraries (if available)
+      Thanks to Viktor for the proposed solution.
+
+  * harbour/config/c.mk
+  * harbour/config/rules.mk
+    + added rules to compile .s files by GCC.
+      I will need it for serial port support in DJGPP builds.
+
 2010-09-07 00:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * src/compiler/hbcomp.c
    ! Revisiting non-*nix stdout/stderr usage in compiler.
--- a/harbour/config/c.mk
+++ b/harbour/config/c.mk
@@ -3,6 +3,7 @@
 #

 C_OBJS := $(C_SOURCES:.c=$(OBJ_EXT)) $(CPP_SOURCES:.cpp=$(OBJ_EXT))
+S_OBJS := $(S_SOURCES:.s=$(OBJ_EXT)) $(SS_SOURCES:.S=$(OBJ_EXT))

 C_MAIN_OBJ := $(C_MAIN:.c=$(OBJ_EXT))

@@ -19,7 +20,7 @@ ifdef YACC_SOURCE
   endif
 endif

-ALL_C_OBJS := $(YACC_OBJ) $(C_OBJS) $(C_MAIN_OBJ)
+ALL_C_OBJS := $(YACC_OBJ) $(C_OBJS) $(C_MAIN_OBJ) $(S_OBJS)

 $(YACC_OBJ) : $(YACC_C)

--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -56,6 +56,15 @@ ifeq ($(CC_RULE),)
   endif
 endif

+ifeq ($(S_RULE),)
+   # the hack with .s => .S translation is workaround for
+   # some filesystems which can change filename to lowercase
+   S_RULE = $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.s=$(OBJ_EXT)) $(HB_CFLAGS_STA) $(CC_IN) $(<:.s=.S))
+endif
+ifeq ($(SS_RULE),)
+   SS_RULE = $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.S=$(OBJ_EXT)) $(HB_CFLAGS_STA) $(CC_IN) $<)
+endif
+
 # The rule to compile a C++ source file.
 ifeq ($(CPP_RULE),)
   ifeq ($(CXX),)
@@ -98,6 +107,20 @@ endif
 %$(RES_EXT) : $(GRANDP)%.rc
 	$(RC_RULE)

+# Rule to generate an object file from a assembler .s file.
+%$(OBJ_EXT) : $(GRANDP)%.s
+	$(S_RULE)
+
+%$(OBJ_EXT) : %.s
+	$(S_RULE)
+
+# Rule to generate an object file from a assembler .S file.
+%$(OBJ_EXT) : $(GRANDP)%.S
+	$(SS_RULE)
+
+%$(OBJ_EXT) : %.S
+	$(SS_RULE)
+
 %$(RES_EXT) : %.rc
 	$(RC_RULE)

--- a/harbour/contrib/gtalleg/gtalleg.hbm
+++ b/harbour/contrib/gtalleg/gtalleg.hbm
@@ -13,6 +13,7 @@
 -stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm}

 -depkeyhead=allegro:allegro.h
+-depcontrol=allegro:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=allegro:${HB_WITH_ALLEGRO}
 -depincpath=allegro:/usr/include
 -depincpath=allegro:/opt/local/include
--- a/harbour/contrib/hbbz2/hbbz2.hbp
+++ b/harbour/contrib/hbbz2/hbbz2.hbp
@@ -12,6 +12,7 @@
 -stop{wce}

 -depkeyhead=bzip2:bzlib.h
+-depcontrol=bzip2:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=bzip2:${HB_WITH_BZIP2}
 -depincpath=bzip2:/usr/include
 -depincpathlocal=bzip2:../../external/bzip2
--- a/harbour/contrib/hbcairo/hbcairo.hbp
+++ b/harbour/contrib/hbcairo/hbcairo.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=cairo:cairo.h
+-depcontrol=cairo:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=cairo:${HB_WITH_CAIRO}
 -depincpath=cairo:/usr/include/cairo
 -depincpath=cairo:/opt/local/include/cairo
--- a/harbour/contrib/hbcups/hbcups.hbp
+++ b/harbour/contrib/hbcups/hbcups.hbp
@@ -12,6 +12,7 @@
 -stop{win|wce|dos}

 -depkeyhead=cups:cups/cups.h
+-depcontrol=cups:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=cups:${HB_WITH_CUPS}
 -depincpath=cups:/usr/include

--- a/harbour/contrib/hbcurl/hbcurl.hbm
+++ b/harbour/contrib/hbcurl/hbcurl.hbm
@@ -11,6 +11,7 @@
 -w3 -es2

 -depkeyhead=curl:curl/curl.h
+-depcontrol=curl:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=curl:${HB_WITH_CURL}
 -depincpath=curl:/usr/include

--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -15,6 +15,7 @@ tfirebrd.prg
 -stop{pocc64|poccarm}

 -depkeyhead=firebird:ibase.h
+-depcontrol=firebird:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=firebird:${HB_WITH_FIREBIRD}
 -depincpath=firebird:/usr/include
 -depincpath=firebird:/opt/firebird/include
--- a/harbour/contrib/hbfimage/hbfimage.hbp
+++ b/harbour/contrib/hbfimage/hbfimage.hbp
@@ -12,6 +12,7 @@
 -stop{dos|os2}

 -depkeyhead=freeimage:FreeImage.h
+-depcontrol=freeimage:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=freeimage:${HB_WITH_FREEIMAGE}
 -depincpath=freeimage:/usr/include
 -depincpath=freeimage:/opt/local/include
--- a/harbour/contrib/hbgd/hbgd.hbp
+++ b/harbour/contrib/hbgd/hbgd.hbp
@@ -13,6 +13,7 @@

 -deppkgname=gd:gd-devel
 -depkeyhead=gd:gd.h
+-depcontrol=gd:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=gd:${HB_WITH_GD}
 -depincpath=gd:/usr/include
 -depincpath=gd:/opt/local/include
--- a/harbour/contrib/hbhpdf/hbhpdf.hbp
+++ b/harbour/contrib/hbhpdf/hbhpdf.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=libharu:hpdf.h
+-depcontrol=libharu:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=libharu:${HB_WITH_LIBHARU}
 -depincpath=libharu:/usr/include
 -depincpath=libharu:/usr/local/include
--- a/harbour/contrib/hbmysql/hbmysql.hbp
+++ b/harbour/contrib/hbmysql/hbmysql.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=mysql:mysql.h
+-depcontrol=mysql:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=mysql:${HB_WITH_MYSQL}
 -depincpath=mysql:/usr/include/mysql
 -depincpath=mysql:/opt/local/include/mysql5/mysql
--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=minizip:zip.h
+-depcontrol=minizip:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=minizip:${HB_WITH_MINIZIP}
 -depincpath=minizip:/usr/include
 -depincpath=minizip:/usr/local/include
@@ -17,6 +18,7 @@

 # This is a dependency of minizip
 -depkeyhead=zlib:zlib.h
+-depcontrol=zlib:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=zlib:${HB_WITH_ZLIB}
 -depincpath=zlib:/usr/include
 -depincpath=zlib:/usr/local/include
--- a/harbour/contrib/hbodbc/hbodbc.hbp
+++ b/harbour/contrib/hbodbc/hbodbc.hbp
@@ -12,6 +12,7 @@
 -stop{dos|os2|rsxnt}

 -depkeyhead=odbc:sql.h
+{!allwin&&HB_BUILD_EXTDEF='no'}-depcontrol=odbc:no
 {!allwin}-depcontrol=odbc:${HB_WITH_ODBC}
 {allwin&!msvcarm}-depcontrol=odbc:force
 -depincpath=odbc:/usr/include
--- a/harbour/contrib/hbpgsql/hbpgsql.hbp
+++ b/harbour/contrib/hbpgsql/hbpgsql.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=pgsql:libpq-fe.h
+-depcontrol=pgsql:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=pgsql:${HB_WITH_PGSQL}
 -depincpath=pgsql:/usr/include
 -depincpath=pgsql:/usr/local/pgsql/include
--- a/harbour/contrib/hbqt/hbqt_common.hbc
+++ b/harbour/contrib/hbqt/hbqt_common.hbc
@@ -8,6 +8,7 @@
 # ---------------------------------------------------------------

 stop={dos|watcom|bcc|pocc|pocc64|poccarm|msvcia64}'hbqt' doesn't support this platform/compiler (${hb_plat}/${hb_comp}).
+stop={HB_WITH_QT='no'}QT deselected, build skipped.

 incpaths=.

--- a/harbour/contrib/hbsqlit3/hbsqlit3.hbp
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.hbp
@@ -10,6 +10,7 @@
 -w3 -es2

 -depkeyhead=sqlite3:sqlite3.h
+-depcontrol=sqlite3:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=sqlite3:${HB_WITH_SQLITE3}
 -depincpath=sqlite3:/usr/include
 -depincpath=sqlite3:/boot/common/include
--- a/harbour/contrib/hbssl/hbssl.hbm
+++ b/harbour/contrib/hbssl/hbssl.hbm
@@ -13,6 +13,7 @@
 -w3 -es2

 -depkeyhead=openssl:openssl/ssl.h
+-depcontrol=openssl:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=openssl:${HB_WITH_OPENSSL}
 -depincpath=openssl:/usr/include
 -depincpath=openssl:/usr/local/include
--- a/harbour/contrib/hbwin/hbwin.hbp
+++ b/harbour/contrib/hbwin/hbwin.hbp
@@ -14,6 +14,7 @@
 -cflag=-DWIN32_LEAN_AND_MEAN

 -depkeyhead=png:png.h
+-depcontrol=png:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=png:${HB_WITH_PNG}
 -depincpath=png:/usr/include
 -depincpath=png:/opt/local/include
--- a/harbour/contrib/sddfb/sddfb.hbp
+++ b/harbour/contrib/sddfb/sddfb.hbp
@@ -14,6 +14,7 @@
 -stop{pocc64|poccarm}

 -depkeyhead=firebird:ibase.h
+-depcontrol=firebird:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=firebird:${HB_WITH_FIREBIRD}
 -depincpath=firebird:/usr/include
 -depincpath=firebird:/opt/firebird/include
--- a/harbour/contrib/sddmy/sddmy.hbp
+++ b/harbour/contrib/sddmy/sddmy.hbp
@@ -12,6 +12,7 @@
 ../rddsql/rddsql.hbc

 -depkeyhead=mysql:mysql.h
+-depcontrol=mysql:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=mysql:${HB_WITH_MYSQL}
 -depincpath=mysql:/usr/include/mysql
 -depincpath=mysql:/opt/local/include/mysql5/mysql
--- a/harbour/contrib/sddoci/sddoci.hbp
+++ b/harbour/contrib/sddoci/sddoci.hbp
@@ -14,6 +14,7 @@
 -stop{dos|os2|wce}

 -depkeyhead=ocilib:ocilib.h
+-depcontrol=ocilib:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=ocilib:${HB_WITH_OCILIB}
 -depincpath=ocilib:/usr/include
 -depincpath=ocilib:/usr/local/include
--- a/harbour/contrib/sddodbc/sddodbc.hbp
+++ b/harbour/contrib/sddodbc/sddodbc.hbp
@@ -14,6 +14,7 @@
 -stop{dos|os2|rsxnt}

 -depkeyhead=odbc:sql.h
+{!allwin&&HB_BUILD_EXTDEF='no'}-depcontrol=odbc:no
 {!allwin}-depcontrol=odbc:${HB_WITH_ODBC}
 {allwin&!msvcarm}-depcontrol=odbc:force
 -depincpath=odbc:/usr/include
--- a/harbour/contrib/sddpg/sddpg.hbp
+++ b/harbour/contrib/sddpg/sddpg.hbp
@@ -12,6 +12,7 @@
 ../rddsql/rddsql.hbc

 -depkeyhead=pgsql:libpq-fe.h
+-depcontrol=pgsql:no{HB_BUILD_EXTDEF='no'}
 -depcontrol=pgsql:${HB_WITH_PGSQL}
 -depincpath=pgsql:/usr/include
 -depincpath=pgsql:/usr/local/pgsql/include
--- a/harbour/contrib/sddsqlt3/sddsqlt3.hbp
+++ b/harbour/contrib/sddsqlt3/sddsqlt3.hbp
@@ -12,6 +12,7 @@
 ../rddsql/rddsql.hbc

 -depkeyhead=sqlite3:sqlite3.h
+-depcontrol=sqlite3:local{HB_BUILD_EXTDEF='no'}
 -depcontrol=sqlite3:${HB_WITH_SQLITE3}
 -depincpath=sqlite3:/usr/include
 -depincpath=sqlite3:/boot/common/include