From e338befa21c954dfc647258a096fbdc2330bbcec Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Thu, 24 Jan 2008 23:35:30 +0000
Subject: [PATCH]   * mode objfpc added   * remove old fpmake

git-svn-id: trunk@9910 -
---
 .gitattributes                   |  2 --
 packages/fcl-xml/src/dom_html.pp |  2 ++
 packages/fcl-xml/src/fpmake.inc  | 20 --------------------
 packages/fcl-xml/src/fpmake.pp   | 20 --------------------
 packages/fcl-xml/src/sax.pp      |  8 +-------
 packages/fcl-xml/src/sax_html.pp |  2 ++
 packages/fcl-xml/src/sax_xml.pp  |  5 +++--
 packages/fcl-xml/src/xmlutils.pp |  3 +++
 packages/fcl-xml/src/xmlwrite.pp |  4 ----
 9 files changed, 11 insertions(+), 55 deletions(-)
 delete mode 100644 packages/fcl-xml/src/fpmake.inc
 delete mode 100644 packages/fcl-xml/src/fpmake.pp

diff --git a/.gitattributes b/.gitattributes
index 3aef740dbc..566113b61e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4229,8 +4229,6 @@ packages/fcl-xml/Makefile.fpc svneol=native#text/plain
 packages/fcl-xml/src/README -text
 packages/fcl-xml/src/dom.pp svneol=native#text/plain
 packages/fcl-xml/src/dom_html.pp svneol=native#text/plain
-packages/fcl-xml/src/fpmake.inc svneol=native#text/plain
-packages/fcl-xml/src/fpmake.pp svneol=native#text/plain
 packages/fcl-xml/src/htmldefs.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlelements.pp svneol=native#text/plain
 packages/fcl-xml/src/htmlwriter.pp svneol=native#text/plain
diff --git a/packages/fcl-xml/src/dom_html.pp b/packages/fcl-xml/src/dom_html.pp
index 1f4922c423..971d4e27f0 100644
--- a/packages/fcl-xml/src/dom_html.pp
+++ b/packages/fcl-xml/src/dom_html.pp
@@ -17,6 +17,8 @@
 { Please note that this is a very early version, most properties and methods
   are not implemented yet. }
 
+{$mode objfpc}
+{$H+}
 
 unit DOM_HTML;
 
diff --git a/packages/fcl-xml/src/fpmake.inc b/packages/fcl-xml/src/fpmake.inc
deleted file mode 100644
index 2395ca613c..0000000000
--- a/packages/fcl-xml/src/fpmake.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-{ Make XML directory and all subdirectories }
-{ FULLFCL will be defined if included from main FCL directory }
-
-Targets.ResetDefaults;
-Targets.DefaultDir:='xml';
-T:=Targets.AddUnit('sax');
-T.ResourceStrings:=True;
-T:=Targets.AddUnit('dom');
-T:=Targets.AddUnit('sax_html');
-T:=Targets.AddUnit('dom_html');
-T:=Targets.AddUnit('xmlcfg');
-T:=Targets.AddUnit('xmlread');
-T:=Targets.AddUnit('xmlstreaming');
-T:=Targets.AddUnit('xmlwrite');
-T:=Targets.AddUnit('xhtml');
-T:=Targets.AddUnit('htmldefs');
-T:=Targets.AddUnit('htmwrite');
-T:=Targets.AddUnit('xpath');
-T:=Targets.AddUnit('htmlelements');
-T:=Targets.AddUnit('htmlwriter');
diff --git a/packages/fcl-xml/src/fpmake.pp b/packages/fcl-xml/src/fpmake.pp
deleted file mode 100644
index 071c4869a6..0000000000
--- a/packages/fcl-xml/src/fpmake.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-{$mode objfpc}
-{$H+}
-program fpmake;
-
-uses fpmkunit;
-
-Var
-  T : TTarget;
-   
-begin
-  ChangeDir('..');
-  With Installer do 
-    begin
-    {$i ../fclmake.inc}
-    {$i fpmake.inc}
-    EndPackage;
-    Run;
-    end;
-end.
-
diff --git a/packages/fcl-xml/src/sax.pp b/packages/fcl-xml/src/sax.pp
index d2747acbd0..190ead191e 100644
--- a/packages/fcl-xml/src/sax.pp
+++ b/packages/fcl-xml/src/sax.pp
@@ -17,13 +17,7 @@
 
 unit SAX;
 
-{ $DEFINE UseDynArrays}
-
-{ $IFDEF UseDynArrays}
-  {$MODE objfpc}
-{ $ELSE}
-  { $MODE Delphi}
-{ $ENDIF}
+{$MODE objfpc}
 {$H+}
 
 
diff --git a/packages/fcl-xml/src/sax_html.pp b/packages/fcl-xml/src/sax_html.pp
index 9db74b2bcc..17ec7334bf 100644
--- a/packages/fcl-xml/src/sax_html.pp
+++ b/packages/fcl-xml/src/sax_html.pp
@@ -24,6 +24,8 @@
   * Entity references in attribute values don't get parsed.
 }
 
+{$mode objfpc}
+{$H+}
 
 unit SAX_HTML;
 
diff --git a/packages/fcl-xml/src/sax_xml.pp b/packages/fcl-xml/src/sax_xml.pp
index eeb41c5d6c..ca7eb1604b 100644
--- a/packages/fcl-xml/src/sax_xml.pp
+++ b/packages/fcl-xml/src/sax_xml.pp
@@ -1,5 +1,3 @@
-{$mode objfpc}
-{$h+}
 {
     This file is part of the Free Component Library
     Copyright (c) 2006 by Michael Van Canneyt.
@@ -16,6 +14,9 @@
 
  **********************************************************************}
 
+{$mode objfpc}
+{$h+}
+
 unit SAX_XML;
 
 interface
diff --git a/packages/fcl-xml/src/xmlutils.pp b/packages/fcl-xml/src/xmlutils.pp
index f3b1f8bfcf..4bb8a75b23 100644
--- a/packages/fcl-xml/src/xmlutils.pp
+++ b/packages/fcl-xml/src/xmlutils.pp
@@ -14,6 +14,9 @@
  **********************************************************************}
 unit xmlutils;
 
+{$mode objfpc}
+{$H+}
+
 interface
 
 uses
diff --git a/packages/fcl-xml/src/xmlwrite.pp b/packages/fcl-xml/src/xmlwrite.pp
index ac61b14a50..cb35252d40 100644
--- a/packages/fcl-xml/src/xmlwrite.pp
+++ b/packages/fcl-xml/src/xmlwrite.pp
@@ -17,12 +17,8 @@
 
 unit XMLWrite;
 
-{$ifdef fpc}
 {$MODE objfpc}
 {$H+}
-{/$DEFINE HAS_INLINE}
-{$INLINE OFF}
-{$endif}
 
 interface