Forráskód Böngészése

* merged into fpmake.pp

git-svn-id: trunk@9116 -
peter 18 éve
szülő
commit
6577a39bab
3 módosított fájl, 19 hozzáadás és 15 törlés
  1. 0 1
      .gitattributes
  2. 0 11
      packages/hash/fpmake.inc
  3. 19 3
      packages/hash/fpmake.pp

+ 0 - 1
.gitattributes

@@ -4325,7 +4325,6 @@ packages/fpmkunit/fpmake.pp svneol=native#text/plain
 packages/fpmkunit/src/fpmkunit.pp svneol=native#text/plain
 packages/hash/Makefile svneol=native#text/plain
 packages/hash/Makefile.fpc svneol=native#text/plain
-packages/hash/fpmake.inc svneol=native#text/plain
 packages/hash/fpmake.pp svneol=native#text/plain
 packages/hash/src/crc.pas svneol=native#text/plain
 packages/hash/src/md5.pp svneol=native#text/plain

+ 0 - 11
packages/hash/fpmake.inc

@@ -1,11 +0,0 @@
-    StartPackage('hash');
-    Version:='2.0.0';
-    T:=Targets.AddUnit('src/md5.pp');
-    T:=Targets.AddUnit('src/crc.pp');
-    T:=Targets.AddUnit('src/ntlm.pas');
-    T:=Targets.AddUnit('src/uuid.pas');
-    T:=Targets.AddUnit('src/unixcrypt.pas');
-    T.OS:=[Linux];
-    T:=Targets.AddExampleunit('tests/mdtest.pas');
-    EndPackage;
-

+ 19 - 3
packages/hash/fpmake.pp

@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
@@ -9,9 +10,24 @@ Var
 begin
   With Installer do 
     begin
-    { Base packages }
-    {$i fpmake.inc}
+{$endif ALLPACKAGES}    
+
+    StartPackage('hash');
+{$ifdef ALLPACKAGES}
+    Directory:='hash';
+{$endif ALLPACKAGES}    
+    Version:='2.0.0';
+    T:=Targets.AddUnit('src/md5.pp');
+    T:=Targets.AddUnit('src/crc.pas');
+    T:=Targets.AddUnit('src/ntlm.pas');
+    T:=Targets.AddUnit('src/uuid.pas');
+    T:=Targets.AddUnit('src/unixcrypt.pas');
+    T.OS:=[Linux];
+    T:=Targets.AddExampleunit('tests/mdtest.pas');
+    EndPackage;
+    
+{$ifndef ALLPACKAGES}
     Run;
     end;
 end.
-
+{$endif ALLPACKAGES}