2
0
Эх сурвалжийг харах

* fixed fcl and fpcdir paths/dependencies

git-svn-id: trunk@6719 -
Jonas Maebe 18 жил өмнө
parent
commit
1d4a25df3b

+ 1 - 1
packages/base/oracle/example/Makefile.fpc

@@ -7,7 +7,7 @@ units=oraclew
 examples=test01
 
 [require]
-packages=oracle fcl
+packages=oracle fcl-base fcl-db fcl-xml
 
 [install]
 fpcpackage=y

+ 2 - 2
packages/fcl-base/tests/Makefile.fpc

@@ -32,13 +32,13 @@ programs_emx=isockcli isocksvr testhres testnres testsres testrhre \
 rst=restest
 
 [require]
-packages=fcl
+packages=fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
 
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../..
+fpcdir=../../..
 
 [rules]
 .NOTPARALLEL:

+ 1 - 1
packages/fcl-db/tests/Makefile.fpc

@@ -12,7 +12,7 @@ examples=dbtestframework
 fpcpackage=y
 
 [default]
-fpcdir=../..
+fpcdir=../../..
 
 
 [rules]

+ 1 - 1
packages/fcl-fpcunit/src/exampletests/Makefile.fpc

@@ -16,7 +16,7 @@ targetdir=../../$(OS_TARGET)
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 [rules]
 .NOTPARALLEL:

+ 1 - 1
packages/fcl-fpcunit/src/tests/Makefile.fpc

@@ -16,7 +16,7 @@ targetdir=../../$(OS_TARGET)
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 [rules]
 .NOTPARALLEL:

+ 2 - 2
packages/fcl-net/src/tests/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [require]
-packages=fcl
+packages=fcl-base fcl-xml fcl-net
 
 [target]
 programs=rpcserv rpccli
@@ -16,7 +16,7 @@ options=-S2h
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 
 [rules]

+ 1 - 1
utils/fpcm/Makefile.fpc

@@ -10,7 +10,7 @@ rsts=fpcmmain
 units=fpcmmain fpcmdic fpcmwr fpcmpkg
 
 [require]
-packages=fcl
+packages=fcl-base
 tools=data2inc
 
 [install]

+ 1 - 1
utils/fpdoc/fpde/Makefile.fpc

@@ -7,7 +7,7 @@ name=fpde
 version=2.0.0
 
 [require]
-packages=fcl fpgtk
+packages=fcl-base fcl-xml fcl-passrc fpgtk
 
 [target]
 programs=fpde

+ 1 - 1
utils/fpmc/Makefile.fpc

@@ -12,7 +12,7 @@ rsts=frmabout frmmain frmoptions msgcomp
 units=frmmain msgcomp frmabout frmoptions
 
 [require]
-packages=fcl fpgtk
+packages=fcl-base fpgtk
 
 [compiler]