From a80ff2b46908fca5f968a451df6230faaacd2575 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sat, 3 Nov 2007 23:06:21 +0000
Subject: [PATCH]   * updated

git-svn-id: trunk@9122 -
---
 .gitattributes              |  1 -
 packages/paszlib/fpmake.inc | 51 -------------------------------------
 packages/paszlib/fpmake.pp  | 40 ++++++++++++++++++++++++++---
 3 files changed, 37 insertions(+), 55 deletions(-)
 delete mode 100644 packages/paszlib/fpmake.inc

diff --git a/.gitattributes b/.gitattributes
index bf4144a570..61b33ef4b1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4335,7 +4335,6 @@ packages/hash/tests/md5.ref svneol=native#text/plain
 packages/hash/tests/mdtest.pas svneol=native#text/plain
 packages/paszlib/Makefile svneol=native#text/plain
 packages/paszlib/Makefile.fpc svneol=native#text/plain
-packages/paszlib/fpmake.inc svneol=native#text/plain
 packages/paszlib/fpmake.pp svneol=native#text/plain
 packages/paszlib/readme.txt svneol=native#text/plain
 packages/paszlib/src/adler.pas svneol=native#text/plain
diff --git a/packages/paszlib/fpmake.inc b/packages/paszlib/fpmake.inc
deleted file mode 100644
index 59e4b6b2c7..0000000000
--- a/packages/paszlib/fpmake.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-    StartPackage('paszlib');
-    Version:='2.2.0';
-    Dependencies.Add('hash');
-    T:=Targets.AddUnit('paszlib');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zip');
-      T.Directory:='src';
-    T:=Targets.AddUnit('unzip');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zipper');
-      T.Directory:='src';
-    T:=Targets.AddUnit('adler');
-      T.Directory:='src';
-    T:=Targets.AddUnit('gzio');
-      T.Directory:='src';
-    T:=Targets.AddUnit('infblock');
-      T.Directory:='src';
-    T:=Targets.AddUnit('infcodes');
-      T.Directory:='src';
-    T:=Targets.AddUnit('inffast');
-      T.Directory:='src';
-    T:=Targets.AddUnit('inftrees');
-      T.Directory:='src';
-    T:=Targets.AddUnit('infutil');
-      T.Directory:='src';
-    T:=Targets.AddUnit('trees');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zcompres');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zdeflate');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zinflate');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zbase');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zuncompr');
-      T.Directory:='src';
-    T:=Targets.AddUnit('ziputils');
-      T.Directory:='src';
-    T:=Targets.AddUnit('zstream');
-      T.Directory:='src';
-    T:=Targets.AddExampleProgram('example');
-      T.Directory:='tests';
-    T:=Targets.AddExampleProgram('minigzip');
-      T.Directory:='tests';
-    T:=Targets.AddExampleProgram('miniunz');
-      T.Directory:='tests';
-    T:=Targets.AddExampleProgram('minizip');
-      T.Directory:='tests';
-    EndPackage;
-
diff --git a/packages/paszlib/fpmake.pp b/packages/paszlib/fpmake.pp
index d4b6178682..ef6a2c6ef2 100644
--- a/packages/paszlib/fpmake.pp
+++ b/packages/paszlib/fpmake.pp
@@ -1,3 +1,4 @@
+{$ifndef ALLPACKAGES}
 {$mode objfpc}{$H+}
 program fpmake;
 
@@ -7,11 +8,44 @@ Var
   T : TTarget;
 
 begin
-  With Installer do 
+  With Installer do
     begin
-    { Base packages }
-    {$i fpmake.inc}
+{$endif ALLPACKAGES}
+
+    StartPackage('paszlib');
+{$ifdef ALLPACKAGES}
+    Directory:='paszlib';
+{$endif ALLPACKAGES}
+    Version:='2.2.0';
+    Dependencies.Add('hash');
+    T:=Targets.AddUnit('src/paszlib.pas');
+    T:=Targets.AddUnit('src/zip.pas');
+    T:=Targets.AddUnit('src/unzip.pas');
+    T:=Targets.AddUnit('src/zipper.pp');
+    T:=Targets.AddImplicitUnit('src/adler.pas');
+    T:=Targets.AddImplicitUnit('src/gzio.pas');
+    T:=Targets.AddImplicitUnit('src/infblock.pas');
+    T:=Targets.AddImplicitUnit('src/infcodes.pas');
+    T:=Targets.AddImplicitUnit('src/inffast.pas');
+    T:=Targets.AddImplicitUnit('src/inftrees.pas');
+    T:=Targets.AddImplicitUnit('src/infutil.pas');
+    T:=Targets.AddImplicitUnit('src/trees.pas');
+    T:=Targets.AddImplicitUnit('src/zcompres.pas');
+    T:=Targets.AddImplicitUnit('src/zdeflate.pas');
+    T:=Targets.AddImplicitUnit('src/zinflate.pas');
+    T:=Targets.AddImplicitUnit('src/zbase.pas');
+    T:=Targets.AddImplicitUnit('src/zuncompr.pas');
+    T:=Targets.AddImplicitUnit('src/ziputils.pas');
+    T:=Targets.AddImplicitUnit('src/zstream.pp');
+    T:=Targets.AddExampleProgram('tests/example.pas');
+    T:=Targets.AddExampleProgram('tests/minigzip.pas');
+    T:=Targets.AddExampleProgram('tests/miniunz.pas');
+    T:=Targets.AddExampleProgram('tests/minizip.pas');
+    EndPackage;
+
+{$ifndef ALLPACKAGES}
     Run;
     end;
 end.
+{$endif ALLPACKAGES}