* graph moved

git-svn-id: trunk@10036 -

.gitattributes

@@ -1208,31 +1208,6 @@ packages/extra/gnome1/zvt/zvt/libzvt.pp svneol=native#text/plain
 packages/extra/gnome1/zvt/zvt/lists.inc svneol=native#text/plain
 packages/extra/gnome1/zvt/zvt/vt.inc svneol=native#text/plain
 packages/extra/gnome1/zvt/zvt/vtx.inc svneol=native#text/plain
-packages/extra/graph/Makefile -text
-packages/extra/graph/Makefile.fpc svneol=native#text/plain
-packages/extra/graph/amiga/graph.pp svneol=native#text/plain
-packages/extra/graph/go32v2/graph.pp svneol=native#text/plain
-packages/extra/graph/go32v2/vesa.inc svneol=native#text/plain
-packages/extra/graph/go32v2/vesah.inc svneol=native#text/plain
-packages/extra/graph/inc/clip.inc svneol=native#text/plain
-packages/extra/graph/inc/fills.inc svneol=native#text/plain
-packages/extra/graph/inc/fontdata.inc svneol=native#text/plain
-packages/extra/graph/inc/graph.inc svneol=native#text/plain
-packages/extra/graph/inc/graph.tex -text
-packages/extra/graph/inc/graphh.inc svneol=native#text/plain
-packages/extra/graph/inc/gtext.inc svneol=native#text/plain
-packages/extra/graph/inc/makefile.inc svneol=native#text/plain
-packages/extra/graph/inc/modes.inc svneol=native#text/plain
-packages/extra/graph/inc/palette.inc svneol=native#text/plain
-packages/extra/graph/macosx/graph.pp svneol=native#text/plain
-packages/extra/graph/ptcgraph.pp svneol=native#text/x-pascal
-packages/extra/graph/sdlgraph/sdlgraph.pp svneol=native#text/plain
-packages/extra/graph/unix/ggigraph.pp svneol=native#text/plain
-packages/extra/graph/unix/graph.pp svneol=native#text/plain
-packages/extra/graph/unix/graph16.inc svneol=native#text/plain
-packages/extra/graph/win32/graph.pp svneol=native#text/plain
-packages/extra/graph/win32/wincrt.pp svneol=native#text/plain
-packages/extra/graph/win32/winmouse.pp svneol=native#text/plain
 packages/extra/libndsfpc/Makefile svneol=native#text/plain
 packages/extra/libndsfpc/Makefile.fpc svneol=native#text/plain
 packages/extra/libndsfpc/dswifi/dswifi7.inc svneol=native#text/plain
@@ -2640,6 +2615,31 @@ packages/ggi/fpmake.pp svneol=native#text/plain
 packages/ggi/src/ggi.pp svneol=native#text/plain
 packages/ggi/src/ggi2d.pp svneol=native#text/plain
 packages/ggi/src/gii.pp svneol=native#text/plain
+packages/graph/Makefile svneol=native#text/plain
+packages/graph/Makefile.fpc svneol=native#text/plain
+packages/graph/src/amiga/graph.pp svneol=native#text/plain
+packages/graph/src/go32v2/graph.pp svneol=native#text/plain
+packages/graph/src/go32v2/vesa.inc svneol=native#text/plain
+packages/graph/src/go32v2/vesah.inc svneol=native#text/plain
+packages/graph/src/inc/clip.inc svneol=native#text/plain
+packages/graph/src/inc/fills.inc svneol=native#text/plain
+packages/graph/src/inc/fontdata.inc svneol=native#text/plain
+packages/graph/src/inc/graph.inc svneol=native#text/plain
+packages/graph/src/inc/graph.tex -text
+packages/graph/src/inc/graphh.inc svneol=native#text/plain
+packages/graph/src/inc/gtext.inc svneol=native#text/plain
+packages/graph/src/inc/makefile.inc svneol=native#text/plain
+packages/graph/src/inc/modes.inc svneol=native#text/plain
+packages/graph/src/inc/palette.inc svneol=native#text/plain
+packages/graph/src/macosx/graph.pp svneol=native#text/plain
+packages/graph/src/ptcgraph.pp svneol=native#text/x-pascal
+packages/graph/src/sdlgraph/sdlgraph.pp svneol=native#text/plain
+packages/graph/src/unix/ggigraph.pp svneol=native#text/plain
+packages/graph/src/unix/graph.pp svneol=native#text/plain
+packages/graph/src/unix/graph16.inc svneol=native#text/plain
+packages/graph/src/win32/graph.pp svneol=native#text/plain
+packages/graph/src/win32/wincrt.pp svneol=native#text/plain
+packages/graph/src/win32/winmouse.pp svneol=native#text/plain
 packages/gtk1/Makefile svneol=native#text/plain
 packages/gtk1/Makefile.fpc svneol=native#text/plain
 packages/gtk1/README svneol=native#text/plain

.gitignore

@@ -676,21 +676,6 @@ packages/extra/gnome1/zvt/zvt/*.ppu
 packages/extra/gnome1/zvt/zvt/*.s
 packages/extra/gnome1/zvt/zvt/fpcmade.*
 packages/extra/gnome1/zvt/zvt/units
-packages/extra/graph/*.bak
-packages/extra/graph/*.exe
-packages/extra/graph/*.o
-packages/extra/graph/*.ppu
-packages/extra/graph/*.s
-packages/extra/graph/.gdbinit
-packages/extra/graph/fpcmade.*
-packages/extra/graph/inc/*.bak
-packages/extra/graph/inc/*.exe
-packages/extra/graph/inc/*.o
-packages/extra/graph/inc/*.ppu
-packages/extra/graph/inc/*.s
-packages/extra/graph/inc/fpcmade.*
-packages/extra/graph/inc/units
-packages/extra/graph/units
 packages/extra/os2units/*.bak
 packages/extra/os2units/*.exe
 packages/extra/os2units/*.o
@@ -988,6 +973,13 @@ packages/fpgtk/src/pgtk/*.ppu
 packages/fpgtk/src/pgtk/*.s
 packages/fpgtk/src/pgtk/fpcmade.*
 packages/fpgtk/src/pgtk/units
+packages/graph/src/inc/*.bak
+packages/graph/src/inc/*.exe
+packages/graph/src/inc/*.o
+packages/graph/src/inc/*.ppu
+packages/graph/src/inc/*.s
+packages/graph/src/inc/fpcmade.*
+packages/graph/src/inc/units
 packages/gtk1/examples/*.bak
 packages/gtk1/examples/*.exe
 packages/gtk1/examples/*.o

packages/extra/graph/Makefile → packages/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/08]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -98,7 +98,7 @@ endif
 endif
 export ECHO
 endif
-override DEFAULT_FPCDIR=../../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -242,8 +242,8 @@ endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=graph
 override PACKAGE_VERSION=2.1
-GRAPHDIR=inc
-UNIXINC=unix
+GRAPHDIR=src/inc
+UNIXINC=src/unix
 ifndef USELIBGGI
 USELIBGGI=NO
 endif
@@ -251,7 +251,7 @@ GGIGRAPH_UNIT=ggigraph
 GRAPH_UNIT=graph
 GRAPHUNIT_DIR=$(OS_TARGET)
 ifeq ($(OS_TARGET),linux)
-GRAPHUNIT_DIR=unix
+GRAPHUNIT_DIR=src/unix
 UNIXINCDEPS=$(UNIXINC)/graph16.inc
 ifeq ($(CPU_TARGET),powerpc64)
 GGIGRAPH_UNIT=
@@ -261,7 +261,7 @@ GRAPH_UNIT=
 endif
 endif
 ifeq ($(OS_TARGET),freebsd)
-GRAPHUNIT_DIR=unix
+GRAPHUNIT_DIR=src/unix
 UNIXINCDEPS=$(UNIXINC)/graph16.inc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
@@ -632,322 +632,322 @@ ifeq ($(FULL_TARGET),powerpc64-embedded)
 override COMPILER_OPTIONS+=-S2
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc  unix
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc  src/unix
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
+override COMPILER_INCLUDEDIR+=src/$(OS_TARGET) src/inc
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=$(OS_TARGET) inc
+override COMPILER_SOURCEDIR+=src/$(OS_TARGET) src/inc tests examples
 endif
 override SHARED_BUILD=n
 override SHARED_BUILD=n
@@ -2177,7 +2177,7 @@ endif
 endif
 endif
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS),)
+ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@@ -2616,16 +2616,16 @@ makefiles: fpc_makefiles
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
-include inc/makefile.inc
+include src/inc/makefile.inc
 GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
 graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
 	$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
 ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
 	$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp
-winmouse$(PPUEXT) : win32/winmouse.pp graph$(PPUEXT)
-	$(COMPILER) win32/winmouse.pp
-wincrt$(PPUEXT) : win32/wincrt.pp graph$(PPUEXT)
-	$(COMPILER) win32/wincrt.pp
-sdlgraph$(PPUEXT) : sdlgraph/sdlgraph.pp $(GRAPHINCDEPS)
-	$(COMPILER) -I$(GRAPHDIR) sdlgraph/sdlgraph.pp
+winmouse$(PPUEXT) : src/win32/winmouse.pp graph$(PPUEXT)
+	$(COMPILER) src/win32/winmouse.pp
+wincrt$(PPUEXT) : src/win32/wincrt.pp graph$(PPUEXT)
+	$(COMPILER) src/win32/wincrt.pp
+sdlgraph$(PPUEXT) : src/sdlgraph/sdlgraph.pp $(GRAPHINCDEPS)
+	$(COMPILER) -I$(GRAPHDIR) src/sdlgraph/sdlgraph.pp
 .NOTPARALLEL:

packages/extra/graph/Makefile.fpc → packages/graph/Makefile.fpc

@@ -36,26 +36,26 @@ units_i386_darwin=sdlgraph
 
 [compiler]
 options=-S2
-includedir=$(OS_TARGET) inc
-includedir_linux=unix
-includedir_freebsd=unix
-includedir_darwin=unix
-includedir_netbsd=unix
-includedir_openbsd=unix
-sourcedir=$(OS_TARGET) inc
+includedir=src/$(OS_TARGET) src/inc
+includedir_linux=src/unix
+includedir_freebsd=src/unix
+includedir_darwin=src/unix
+includedir_netbsd=src/unix
+includedir_openbsd=src/unix
+sourcedir=src/$(OS_TARGET) src/inc tests examples
 
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../..
 
 [shared]
 build=n
 
 [prerules]
-GRAPHDIR=inc
-UNIXINC=unix
+GRAPHDIR=src/inc
+UNIXINC=src/unix
 
 ifndef USELIBGGI
 USELIBGGI=NO
@@ -66,7 +66,7 @@ GRAPH_UNIT=graph
 GRAPHUNIT_DIR=$(OS_TARGET)
 
 ifeq ($(OS_TARGET),linux)
-GRAPHUNIT_DIR=unix
+GRAPHUNIT_DIR=src/unix
 UNIXINCDEPS=$(UNIXINC)/graph16.inc
 
 ifeq ($(CPU_TARGET),powerpc64)
@@ -79,12 +79,12 @@ endif
 endif
 
 ifeq ($(OS_TARGET),freebsd)
-GRAPHUNIT_DIR=unix
+GRAPHUNIT_DIR=src/unix
 UNIXINCDEPS=$(UNIXINC)/graph16.inc
 endif
 
 [rules]
-include inc/makefile.inc
+include src/inc/makefile.inc
 GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
 
 graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
@@ -93,14 +93,14 @@ graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
 ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
         $(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp
 
-winmouse$(PPUEXT) : win32/winmouse.pp graph$(PPUEXT)
-	$(COMPILER) win32/winmouse.pp
+winmouse$(PPUEXT) : src/win32/winmouse.pp graph$(PPUEXT)
+	$(COMPILER) src/win32/winmouse.pp
 
-wincrt$(PPUEXT) : win32/wincrt.pp graph$(PPUEXT)
-        $(COMPILER) win32/wincrt.pp
+wincrt$(PPUEXT) : src/win32/wincrt.pp graph$(PPUEXT)
+        $(COMPILER) src/win32/wincrt.pp
 
-sdlgraph$(PPUEXT) : sdlgraph/sdlgraph.pp $(GRAPHINCDEPS)
-        $(COMPILER) -I$(GRAPHDIR) sdlgraph/sdlgraph.pp
+sdlgraph$(PPUEXT) : src/sdlgraph/sdlgraph.pp $(GRAPHINCDEPS)
+        $(COMPILER) -I$(GRAPHDIR) src/sdlgraph/sdlgraph.pp
 
 .NOTPARALLEL: