Browse Source

* add fcl-process dependency

git-svn-id: trunk@9124 -
peter 18 years ago
parent
commit
220567d30b
3 changed files with 20 additions and 12 deletions
  1. 0 1
      .gitattributes
  2. 0 6
      packages/fpmkunit/fpmake.inc
  3. 20 5
      packages/fpmkunit/fpmake.pp

+ 0 - 1
.gitattributes

@@ -4320,7 +4320,6 @@ packages/fcl-xml/tests/xmlts.pp svneol=native#text/plain
 packages/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/Makefile svneol=native#text/plain
 packages/fpmkunit/Makefile.fpc svneol=native#text/plain
-packages/fpmkunit/fpmake.inc svneol=native#text/plain
 packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
 packages/hash/Makefile svneol=native#text/plain

+ 0 - 6
packages/fpmkunit/fpmake.inc

@@ -1,6 +0,0 @@
-    StartPackage('fpmkunit');
-    Version:='2.0.0';
-    Description:='Free Pascal Make Tool';
-    T:=Targets.AddUnit('fpmkunit');
-      T.Directory:='src';
-    EndPackage;

+ 20 - 5
packages/fpmkunit/fpmake.pp

@@ -1,15 +1,30 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
 uses fpmkunit;
 
-var
+Var
   T : TTarget;
+
 begin
-  with Installer do
+  With Installer do
     begin
-      {$i fpmake.inc}
-      Run;
+{$endif ALLPACKAGES}
+
+    StartPackage('fpmkunit');
+{$ifdef ALLPACKAGES}
+    Directory:='fpmkunit';
+{$endif ALLPACKAGES}
+    AddDependency('paszlib');
+    AddDependency('fcl-process');
+    Version:='2.2.0';
+    Description:='Free Pascal Make Tool';
+    T:=Targets.AddUnit('src/fpmkunit.pp');
+    EndPackage;
+
+{$ifndef ALLPACKAGES}
+    Run;
     end;
 end.
-
+{$endif ALLPACKAGES}