* More fpmake fixes. Exampledirs and includefiles mostly fixed for these.

gdbint moves two examples from src to exampledir + makefile fix.

git-svn-id: trunk@11949 -

.gitattributes

@@ -1735,6 +1735,8 @@ packages/fv/src/views.pas svneol=native#text/plain
 packages/fv/src/w32smsg.inc svneol=native#text/plain
 packages/gdbint/Makefile svneol=native#text/plain
 packages/gdbint/Makefile.fpc svneol=native#text/plain
+packages/gdbint/examples/symify.pp svneol=native#text/plain
+packages/gdbint/examples/testgdb.pp svneol=native#text/plain
 packages/gdbint/fpmake.pp svneol=native#text/plain
 packages/gdbint/src/freadlin.pp svneol=native#text/x-pascal
 packages/gdbint/src/gdbcon.pp svneol=native#text/plain
@@ -1742,8 +1744,6 @@ packages/gdbint/src/gdbint.pp svneol=native#text/plain
 packages/gdbint/src/gdbobjs.inc svneol=native#text/plain
 packages/gdbint/src/gdbver.pp svneol=native#text/plain
 packages/gdbint/src/gdbver_nogdb.inc svneol=native#text/x-pascal
-packages/gdbint/src/symify.pp svneol=native#text/plain
-packages/gdbint/src/testgdb.pp svneol=native#text/plain
 packages/gdbm/Makefile svneol=native#text/plain
 packages/gdbm/Makefile.fpc svneol=native#text/plain
 packages/gdbm/README svneol=native#text/plain

packages/fcl-json/fpmake.pp

@@ -37,8 +37,20 @@ begin
         end;
     T:=P.Targets.AddUnit('jsonscanner.pp');
 
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('confdemo.pp');
+    T:=P.Targets.AddExampleProgram('parsedemo.pp');
+    T:=P.Targets.AddExampleProgram('simpledemo.pp');
+
+    // simpledemo.lpi
+    // confdemo.lpi
+    // parsedemo.lpi
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+
+
+

packages/fcl-net/fpmake.pp

@@ -74,6 +74,22 @@ begin
           AddUnit('httpsvlt');
         end;
     T:=P.Targets.AddProgram('mkxmlrpc.pp',AllUnixOSes);
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('examples/rpccli.pp');
+    P.Targets.AddExampleProgram('examples/svrclass_xmlrpc.pp');
+    P.Targets.AddExampleProgram('examples/ip6test.pp');
+    P.Targets.AddExampleProgram('examples/svrclass.pp');
+    P.Targets.AddExampleProgram('examples/testdns.pp');
+    P.Targets.AddExampleProgram('examples/testnet.pp');
+    P.Targets.AddExampleProgram('examples/testhosts.pp');
+    P.Targets.AddExampleProgram('examples/rpcserv.pp');
+    P.Targets.AddExampleProgram('examples/testsvc.pp');
+    P.Targets.AddExampleProgram('examples/testhst.pp');
+    P.Targets.AddExampleProgram('examples/testuri.pp');
+    P.Targets.AddExampleProgram('examples/testproto.pp');
+    // 'examples/Makefile
+    // 'examples/Makefile.fpc
+    // 'examples/readme.txt
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fcl-registry/fpmake.pp

@@ -18,7 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-
+    P.IncludePath.Add('src');
     T:=P.Targets.AddUnit('registry.pp');
       with T.Dependencies do
         begin
@@ -36,6 +36,12 @@ begin
           AddUnit('xmlwrite');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('tests/testbasics.pp');
+    P.Targets.AddExampleProgram('tests/regtestframework.pp');
+    // 'tests/Makefile
+    // 'tests/Makefile.fpc
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/fcl-xml/fpmake.pp

@@ -124,8 +124,23 @@ begin
           AddUnit('htmldefs');
         end;
 
+ 
+    P.Sources.AddSrc('src/README');
+
+
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('tests/xmlts.pp');
+    P.Targets.AddExampleProgram('tests/domunit.pp');
+    P.Targets.AddExampleProgram('tests/testgen.pp');
+    // 'tests/api.xml
+    // 'tests/README_DOM
+    // 'tests/README
+    // 'tests/template.xml
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+

packages/fftw/fpmake.pp

@@ -22,6 +22,10 @@ begin
 
     T:=P.Targets.AddUnit('fftw_s.pas');
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('examples/example.pas');
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/fpgtk/fpmake.pp

@@ -41,6 +41,12 @@ begin
           AddUnit('fpglib');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('examples/lister.pp');
+    P.Targets.AddExampleProgram('examples/testgtk.pp');
+    // 'examples/Makefile
+    // 'examples/Makefile.fpc
+    // 'examples/testgtk.ppr
 
 {$ifndef ALLPACKAGES}
     Run;

packages/fv/fpmake.pp

@@ -245,6 +245,14 @@ begin
           AddUnit('drivers');
           AddUnit('fvconsts');
         end;
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('examples/testapp.pas');
+    P.Targets.AddExampleProgram('examples/platform.inc');
+    // 'examples/Makefile
+    // 'examples/testapp.lpi
+    // 'examples/Makefile.fpc
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/gdbint/Makefile

@@ -459,178 +459,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
 override TARGET_UNITS+=gdbint gdbcon
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_EXAMPLES+=testgdb symify
+override TARGET_EXAMPLES+=examples/testgdb examples/symify
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)

packages/gdbint/Makefile.fpc

@@ -9,7 +9,7 @@ version=2.2.2
 
 [target]
 units=gdbint gdbcon
-examples=testgdb symify
+examples=examples/testgdb examples/symify
 
 [compiler]
 objectdir=$(GDBLIBDIR)

packages/gdbint/fpmake.pp

@@ -18,7 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
-
+    P.IncludePath.Add('src');
     T:=P.Targets.AddUnit('gdbcon.pp');
       with T.Dependencies do
         begin

packages/gdbm/fpmake.pp

@@ -21,6 +21,11 @@ begin
 
     T:=P.Targets.AddUnit('gdbm.pp');
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('tests/testgdbm.pp');
+    P.Targets.AddExampleProgram('tests/testgdbm2.pp');
+
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/ggi/fpmake.pp

@@ -32,6 +32,9 @@ begin
         end;
     T:=P.Targets.AddUnit('gii.pp');
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('ggi1.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/gnome1/fpmake.pp

@@ -221,6 +221,13 @@ begin
           AddInclude('vtx.inc');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('examples/testzvt.pp');
+    P.Targets.AddExampleProgram('examples/gconfcallback2.pp');
+    P.Targets.AddExampleProgram('examples/gconfexample.pp');
+    P.Targets.AddExampleProgram('examples/gconfcallback1.pp');
+    P.Targets.AddExampleProgram('examples/gnometest.pp');
+
 
 {$ifndef ALLPACKAGES}
     Run;

packages/graph/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src/inc');
 
     T:=P.Targets.AddUnit('ggigraph.pp');
       with T.Dependencies do

packages/gtk1/fpmake.pp

@@ -284,6 +284,39 @@ begin
           AddUnit('glib');
           AddUnit('gdk');
         end;
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('entry.pp');
+    P.Targets.AddExampleProgram('filesel.pp');
+    P.Targets.AddExampleProgram('spinbutton.pp');
+    P.Targets.AddExampleProgram('gtkgldemo.pp');
+    P.Targets.AddExampleProgram('editform.pp');
+    P.Targets.AddExampleProgram('pixmap.pp');
+    P.Targets.AddExampleProgram('scribble.pp');
+    P.Targets.AddExampleProgram('tictactoe.pp');
+    P.Targets.AddExampleProgram('paned.pp');
+    P.Targets.AddExampleProgram('notebook.pp');
+    P.Targets.AddExampleProgram('statusbar.pp');
+    P.Targets.AddExampleProgram('ttt_test.pp');
+    P.Targets.AddExampleProgram('list.pp');
+    P.Targets.AddExampleProgram('clist.pp');
+    P.Targets.AddExampleProgram('toolbar.pp');
+    P.Targets.AddExampleProgram('progressbar.pp');
+    P.Targets.AddExampleProgram('rulers.pp');
+    // 'examples/Makefile
+    // 'examples/Makefile.fpc
+    P.ExamplePath.Add('examples/tutorial');
+    P.Targets.AddExampleProgram('tut6_3.pp');
+    P.Targets.AddExampleProgram('tut6_4.pp');
+    P.Targets.AddExampleProgram('tut4_3.pp');
+    P.Targets.AddExampleProgram('tut6_2.pp');
+    P.Targets.AddExampleProgram('tut6_1.pp');
+    P.Targets.AddExampleProgram('tut2_1.pp');
+    P.Targets.AddExampleProgram('tut4_5.pp');
+    P.Targets.AddExampleProgram('tut8_5.pp');
+    P.Targets.AddExampleProgram('tut3_3.pp');
+    // 'examples/tutorial/Makefile
+    // 'examples/tutorial/Makefile.fpc
+    // 'examples/tutorial/info.xpm
 
 {$ifndef ALLPACKAGES}
     Run;

packages/hash/fpmake.pp

@@ -24,7 +24,7 @@ begin
     T:=P.Targets.AddUnit('src/unixcrypt.pas');
       T.OSes:=[Linux];
     T:=P.Targets.AddExampleunit('examples/mdtest.pas');
-
+    // md5.ref
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/httpd13/fpmake.pp

@@ -17,7 +17,10 @@ begin
     P.Directory:='httpd13';
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
+
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
+
 //    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('httpd.pas');

packages/httpd20/fpmake.pp

@@ -18,6 +18,13 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/apr');
+    P.SourcePath.Add('src/apriconv');
+    P.SourcePath.Add('src/aprutil');
+    P.IncludePath.Add('src');
+    P.IncludePath.Add('src/apr');
+    P.IncludePath.Add('src/apriconv');
+    P.IncludePath.Add('src/aprutil');
 //    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('apriconv.pas');
@@ -86,6 +93,15 @@ begin
           AddUnit('aprutil');
         end;
 
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('minimain.pas');
+    T:=P.Targets.AddExampleProgram('mod_hello.pp');
+    T:=P.Targets.AddExampleProgram('mod_example.pp'); 
+    T.Dependencies.AddInclude('define.inc');	
+    T:=P.Targets.AddExampleProgram('mod_spelling.pp');
+    T.Dependencies.AddInclude('define.inc');	
+    T:=P.Targets.AddExampleProgram('testmodule.pp');
+    T.Dependencies.AddInclude('define.inc');	
 
 {$ifndef ALLPACKAGES}
     Run;

packages/httpd22/fpmake.pp

@@ -18,6 +18,14 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.SourcePath.Add('src/apr');
+    P.SourcePath.Add('src/apriconv');
+    P.SourcePath.Add('src/aprutil');
+    P.IncludePath.Add('src');
+    P.IncludePath.Add('src/apr');
+    P.IncludePath.Add('src/apriconv');
+    P.IncludePath.Add('src/aprutil');
+
 //    P.Dependencies.Add('x11');
 
     T:=P.Targets.AddUnit('apriconv.pas');
@@ -85,10 +93,19 @@ begin
           AddUnit('apr');
           AddUnit('aprutil');
         end;
-
+    P.ExamplePath.Add('examples');
+    T:=P.Targets.AddExampleProgram('minimain.pas');
+    T:=P.Targets.AddExampleProgram('mod_hello.pp');
+    T:=P.Targets.AddExampleProgram('mod_example.pp'); 
+    T.Dependencies.AddInclude('define.inc');	
+    T:=P.Targets.AddExampleProgram('mod_spelling.pp');
+    T.Dependencies.AddInclude('define.inc');	
+    T:=P.Targets.AddExampleProgram('testmodule.pp');
+    T.Dependencies.AddInclude('define.inc');	
 
 {$ifndef ALLPACKAGES}
     Run;
     end;
 end.
 {$endif ALLPACKAGES}
+

packages/ibase/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('ibase40.pp');
     T:=P.Targets.AddUnit('ibase60dyn.pp');
@@ -31,6 +32,9 @@ begin
           AddInclude('ibase60.inc');
         end;
 
+    P.ExamplePath.Add('tests');
+    P.Targets.AddExampleProgram('testib40.pp');
+    P.Targets.AddExampleProgram('testib60.pp');
 
 {$ifndef ALLPACKAGES}
     Run;

packages/iconvenc/fpmake.pp

@@ -22,6 +22,9 @@ begin
 
     T:=P.Targets.AddUnit('iconvenc.pas');
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('iconvtest.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/imagemagick/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('buildim.pp');
       with T.Dependencies do
@@ -51,6 +52,11 @@ begin
           AddUnit('imagemagick');
         end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('screenshot.lpr');
+    P.Targets.AddExampleProgram('wanddemo.lpr');
+    P.Targets.AddExampleProgram('wanddemo.dpr');
+    // 'image.png
 
     {$ifndef ALLPACKAGES}
         Run;

packages/ldap/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
     T:=P.Targets.AddUnit('lber.pas');
       with T.Dependencies do

packages/libc/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
     P.OSES:=[linux];
     p.cpus:=[i386];
     T:=P.Targets.AddUnit('kerneldefs.pp');

packages/libcurl/fpmake.pp

@@ -21,6 +21,10 @@ begin
 
     T:=P.Targets.AddUnit('libcurl.pp');
 
+    P.ExamplePath.Add('tests');
+    P.Targets.AddExampleProgram('testcurl.pp');
+    P.Targets.AddExampleProgram('teststream.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/libgd/fpmake.pp

@@ -21,6 +21,10 @@ begin
 
     T:=P.Targets.AddUnit('gd.pp');
 
+    P.ExamplePath.Add('tests');
+    P.Targets.AddExampleProgram('gdtestcgi.pp');
+    P.Targets.AddExampleProgram('gdtest.pp');
+
 {$ifndef ALLPACKAGES}
     Run;
     end;

packages/libxml/fpmake.pp

@@ -18,6 +18,7 @@ begin
 {$endif ALLPACKAGES}
     P.Version:='2.2.2-0';
     P.SourcePath.Add('src');
+    P.IncludePath.Add('src');
 
   T:=P.Targets.AddUnit('libxml2.pas');
   with T.Dependencies do
@@ -35,7 +36,7 @@ begin
       AddInclude('uri.inc');
       AddInclude('debugXML.inc');
       AddInclude('xmlunicode.inc');
-      AddInclude('DOCBparser.inc');
+//      AddInclude('DOCBparser.inc');
       AddInclude('xmlIO.inc');
       AddInclude('xmlsave.inc');
       AddInclude('HTMLtree.inc');
@@ -71,6 +72,19 @@ begin
       AddInclude('schematron.inc');
     end;
 
+    P.ExamplePath.Add('examples');
+    P.Targets.AddExampleProgram('reader1.pas');
+    P.Targets.AddExampleProgram('io2.pas');
+    P.Targets.AddExampleProgram('io1.pas');
+    P.Targets.AddExampleProgram('tree1.pas');
+    P.Targets.AddExampleProgram('tree2.pas');
+    P.Targets.AddExampleProgram('exutils.pas');
+    P.Targets.AddExampleProgram('reader2.pas');
+    // 'Makefile
+    // 'Makefile.fpc
+    // 'test1.xml
+    // 'test2.xml
+
 {$ifndef ALLPACKAGES}
     Run;
     end;