Browse Source

* Get the tests to compile (incdir and sourcesdir were incomplete)

pierre 25 years ago
parent
commit
fa9047fa9e
6 changed files with 30 additions and 12 deletions
  1. 8 2
      api/go32v2/Makefile
  2. 2 2
      api/go32v2/Makefile.fpc
  3. 8 2
      api/linux/Makefile
  4. 2 2
      api/linux/Makefile.fpc
  5. 8 2
      api/win32/Makefile
  6. 2 2
      api/win32/Makefile.fpc

+ 8 - 2
api/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.13 [2000/02/29]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -218,7 +218,8 @@ ZIPTARGET=install
 
 
 # Directories
 # Directories
 
 
-vpath %$(PASEXT) $(INC)
+vpath %$(PASEXT) $(INC) ../test
+override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 ifndef TARGETDIR
 TARGETDIR=.
 TARGETDIR=.
 endif
 endif
@@ -676,6 +677,11 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 endif
 
 
+ifdef NEEDINCDIR
+override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
+endif
+
+
 # Target dirs
 # Target dirs
 ifdef TARGETDIR
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
 override FPCOPT+=-FE$(TARGETDIR)

+ 2 - 2
api/go32v2/Makefile.fpc

@@ -19,8 +19,8 @@ libname=fpapi
 [dirs]
 [dirs]
 fpcdir=../..
 fpcdir=../..
 targetdir=.
 targetdir=.
-sourcesdir=$(INC)
-
+sourcesdir=$(INC) ../test
+incdir=$(INC)
 
 
 [presettings]
 [presettings]
 INC=../inc
 INC=../inc

+ 8 - 2
api/linux/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.13 [2000/02/29]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -218,7 +218,8 @@ ZIPTARGET=install
 
 
 # Directories
 # Directories
 
 
-vpath %$(PASEXT) $(INC)
+vpath %$(PASEXT) $(INC) ../test
+override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 ifndef TARGETDIR
 TARGETDIR=.
 TARGETDIR=.
 endif
 endif
@@ -676,6 +677,11 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 endif
 
 
+ifdef NEEDINCDIR
+override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
+endif
+
+
 # Target dirs
 # Target dirs
 ifdef TARGETDIR
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
 override FPCOPT+=-FE$(TARGETDIR)

+ 2 - 2
api/linux/Makefile.fpc

@@ -19,8 +19,8 @@ libname=fpapi
 [dirs]
 [dirs]
 fpcdir=../..
 fpcdir=../..
 targetdir=.
 targetdir=.
-sourcesdir=$(INC)
-
+sourcesdir=$(INC) ../test
+incdir=$(INC)
 
 
 [presettings]
 [presettings]
 INC=../inc
 INC=../inc

+ 8 - 2
api/win32/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 [2000/02/09]
+# Makefile generated by fpcmake v0.99.13 [2000/02/29]
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -218,7 +218,8 @@ ZIPTARGET=install
 
 
 # Directories
 # Directories
 
 
-vpath %$(PASEXT) $(INC)
+vpath %$(PASEXT) $(INC) ../test
+override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 ifndef TARGETDIR
 TARGETDIR=.
 TARGETDIR=.
 endif
 endif
@@ -676,6 +677,11 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 override FPCOPT+=-Fu$(UNITSDIR)
 endif
 endif
 
 
+ifdef NEEDINCDIR
+override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))
+endif
+
+
 # Target dirs
 # Target dirs
 ifdef TARGETDIR
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
 override FPCOPT+=-FE$(TARGETDIR)

+ 2 - 2
api/win32/Makefile.fpc

@@ -19,8 +19,8 @@ libname=fpapi
 [dirs]
 [dirs]
 fpcdir=../..
 fpcdir=../..
 targetdir=.
 targetdir=.
-sourcesdir=$(INC)
-
+sourcesdir=$(INC) ../test
+incdir=$(INC)
 
 
 [presettings]
 [presettings]
 INC=../inc
 INC=../inc