* Pass two, src/ creation

git-svn-id: trunk@9981 -

.gitattributes

@@ -3793,129 +3793,129 @@ packages/gtk1/examples/tutorial/tut6_3.pp svneol=native#text/plain
 packages/gtk1/examples/tutorial/tut6_4.pp svneol=native#text/plain
 packages/gtk1/examples/tutorial/tut8_5.pp svneol=native#text/plain
 packages/gtk1/fpmake.pp svneol=native#text/plain
-packages/gtk1/gdk/gdk.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkkeysyms.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkmain.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkpixbuf.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkprivate.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkrgb.pp svneol=native#text/plain
-packages/gtk1/gdk/gdktypes.pp svneol=native#text/plain
-packages/gtk1/gdk/gdkx.pp svneol=native#text/plain
-packages/gtk1/glib/glib.pp svneol=native#text/plain
-packages/gtk1/glib/gmodule.pp svneol=native#text/plain
-packages/gtk1/gtk/gtk.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkaccelerator.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkaccelgroup.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkaccellabel.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkadjustment.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkalignment.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkarg.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkarrow.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkaspectframe.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkbbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkbin.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkbindings.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkbutton.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcalendar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcheckbutton.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcheckmenuitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkclist.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcolorsel.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcombo.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcontainer.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkctree.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkcurve.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkdata.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkdialog.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkdnd.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkdrawingarea.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkeditable.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkentry.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkenums.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkeventbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkfeatures.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkfilesel.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkfixed.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkfontsel.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkframe.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkgamma.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkgc.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhandlebox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhbbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhpaned.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhruler.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhscale.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhscrollbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkhseparator.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkimage.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkincludes.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkinputdialog.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkinvisible.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkitemfactory.pp svneol=native#text/plain
-packages/gtk1/gtk/gtklabel.pp svneol=native#text/plain
-packages/gtk1/gtk/gtklayout.pp svneol=native#text/plain
-packages/gtk1/gtk/gtklist.pp svneol=native#text/plain
-packages/gtk1/gtk/gtklistitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmain.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmarshal.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmenu.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmenubar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmenufactory.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmenuitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmenushell.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkmisc.pp svneol=native#text/plain
-packages/gtk1/gtk/gtknotebook.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkobjects.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkoptionmenu.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkpacker.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkpaned.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkpixmap.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkplug.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkpreview.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkprivate.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkprogress.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkprogressbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkradiobutton.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkradiomenuitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkrange.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkrc.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkruler.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkscale.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkscrollbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkscrolledwindow.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkselection.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkseparator.pp svneol=native#text/plain
-packages/gtk1/gtk/gtksignal.pp svneol=native#text/plain
-packages/gtk1/gtk/gtksocket.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkspinbutton.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkstatusbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkstyle.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktable.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktearoffmenuitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktext.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkthemes.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktipsquery.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktogglebutton.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktoolbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktooltips.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktree.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktreeitem.pp svneol=native#text/plain
-packages/gtk1/gtk/gtktypeutils.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvbbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvbox.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkviewport.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvpaned.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvruler.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvscale.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvscrollbar.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkvseparator.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkwidget.pp svneol=native#text/plain
-packages/gtk1/gtk/gtkwindow.pp svneol=native#text/plain
-packages/gtk1/gtkgl/Makefile.fpc svneol=native#text/plain
-packages/gtk1/gtkgl/gtkglarea.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdk.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkkeysyms.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkmain.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkpixbuf.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkprivate.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkrgb.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdktypes.pp svneol=native#text/plain
+packages/gtk1/src/gdk/gdkx.pp svneol=native#text/plain
+packages/gtk1/src/glib/glib.pp svneol=native#text/plain
+packages/gtk1/src/glib/gmodule.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtk.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkaccelerator.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkaccelgroup.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkaccellabel.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkadjustment.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkalignment.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkarg.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkarrow.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkaspectframe.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkbbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkbin.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkbindings.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkbutton.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcalendar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcheckbutton.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcheckmenuitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkclist.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcolorsel.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcombo.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcontainer.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkctree.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkcurve.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkdata.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkdialog.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkdnd.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkdrawingarea.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkeditable.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkentry.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkenums.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkeventbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkfeatures.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkfilesel.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkfixed.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkfontsel.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkframe.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkgamma.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkgc.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhandlebox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhbbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhpaned.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhruler.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhscale.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhscrollbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkhseparator.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkimage.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkincludes.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkinputdialog.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkinvisible.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkitemfactory.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtklabel.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtklayout.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtklist.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtklistitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmain.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmarshal.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmenu.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmenubar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmenufactory.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmenuitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmenushell.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkmisc.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtknotebook.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkobjects.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkoptionmenu.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkpacker.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkpaned.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkpixmap.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkplug.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkpreview.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkprivate.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkprogress.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkprogressbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkradiobutton.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkradiomenuitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkrange.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkrc.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkruler.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkscale.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkscrollbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkscrolledwindow.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkselection.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkseparator.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtksignal.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtksocket.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkspinbutton.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkstatusbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkstyle.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktable.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktearoffmenuitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktext.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkthemes.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktipsquery.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktogglebutton.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktoolbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktooltips.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktree.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktreeitem.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtktypeutils.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvbbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvbox.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkviewport.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvpaned.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvruler.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvscale.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvscrollbar.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkvseparator.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkwidget.pp svneol=native#text/plain
+packages/gtk1/src/gtk/gtkwindow.pp svneol=native#text/plain
+packages/gtk1/src/gtkgl/Makefile.fpc svneol=native#text/plain
+packages/gtk1/src/gtkgl/gtkglarea.pp svneol=native#text/plain
 packages/hash/Makefile svneol=native#text/plain
 packages/hash/Makefile.fpc svneol=native#text/plain
 packages/hash/examples/md5.ref svneol=native#text/plain

.gitignore

@@ -1377,34 +1377,34 @@ packages/gtk1/examples/tutorial/*.s
 packages/gtk1/examples/tutorial/fpcmade.*
 packages/gtk1/examples/tutorial/units
 packages/gtk1/examples/units
-packages/gtk1/gdk/*.bak
-packages/gtk1/gdk/*.exe
-packages/gtk1/gdk/*.o
-packages/gtk1/gdk/*.ppu
-packages/gtk1/gdk/*.s
-packages/gtk1/gdk/fpcmade.*
-packages/gtk1/gdk/units
-packages/gtk1/glib/*.bak
-packages/gtk1/glib/*.exe
-packages/gtk1/glib/*.o
-packages/gtk1/glib/*.ppu
-packages/gtk1/glib/*.s
-packages/gtk1/glib/fpcmade.*
-packages/gtk1/glib/units
-packages/gtk1/gtk/*.bak
-packages/gtk1/gtk/*.exe
-packages/gtk1/gtk/*.o
-packages/gtk1/gtk/*.ppu
-packages/gtk1/gtk/*.s
-packages/gtk1/gtk/fpcmade.*
-packages/gtk1/gtk/units
-packages/gtk1/gtkgl/*.bak
-packages/gtk1/gtkgl/*.exe
-packages/gtk1/gtkgl/*.o
-packages/gtk1/gtkgl/*.ppu
-packages/gtk1/gtkgl/*.s
-packages/gtk1/gtkgl/fpcmade.*
-packages/gtk1/gtkgl/units
+packages/gtk1/src/gdk/*.bak
+packages/gtk1/src/gdk/*.exe
+packages/gtk1/src/gdk/*.o
+packages/gtk1/src/gdk/*.ppu
+packages/gtk1/src/gdk/*.s
+packages/gtk1/src/gdk/fpcmade.*
+packages/gtk1/src/gdk/units
+packages/gtk1/src/glib/*.bak
+packages/gtk1/src/glib/*.exe
+packages/gtk1/src/glib/*.o
+packages/gtk1/src/glib/*.ppu
+packages/gtk1/src/glib/*.s
+packages/gtk1/src/glib/fpcmade.*
+packages/gtk1/src/glib/units
+packages/gtk1/src/gtk/*.bak
+packages/gtk1/src/gtk/*.exe
+packages/gtk1/src/gtk/*.o
+packages/gtk1/src/gtk/*.ppu
+packages/gtk1/src/gtk/*.s
+packages/gtk1/src/gtk/fpcmade.*
+packages/gtk1/src/gtk/units
+packages/gtk1/src/gtkgl/*.bak
+packages/gtk1/src/gtkgl/*.exe
+packages/gtk1/src/gtkgl/*.o
+packages/gtk1/src/gtkgl/*.ppu
+packages/gtk1/src/gtkgl/*.s
+packages/gtk1/src/gtkgl/fpcmade.*
+packages/gtk1/src/gtkgl/units
 packages/paszlib/*.bak
 packages/paszlib/*.exe
 packages/paszlib/*.o

packages/gtk1/Makefile

@@ -562,163 +562,163 @@ override TARGET_EXAMPLEDIRS+=examples
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_SOURCEDIR+=glib gdk gtk gtkgl
+override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
 override SHARED_BUILD=n
 override SHARED_BUILD=n
@@ -2508,9 +2508,9 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
-glib$(PPUEXT): $(wildcard glib/glib*.pp)
-gmodule$(PPUEXT): $(wildcard glib/gmodule*.pp) glib$(PPUEXT)
-gdk$(PPUEXT): $(wildcard gdk/gdk*.pp) glib$(PPUEXT)
-gdkpixbuf$(PPUEXT): gdk/gdkpixbuf.pp gdk$(PPUEXT)
-gtk$(PPUEXT): $(wildcard gtk/gtk*.pp) gdk$(PPUEXT)
-gtkglarea$(PPUEXT): $(wildcard gtkgl/gtkgla*.pp) gdk$(PPUEXT) gtk$(PPUEXT)
+glib$(PPUEXT): $(wildcard src/glib/glib*.pp)
+gmodule$(PPUEXT): $(wildcard src/glib/gmodule*.pp) glib$(PPUEXT)
+gdk$(PPUEXT): $(wildcard src/gdk/gdk*.pp) glib$(PPUEXT)
+gdkpixbuf$(PPUEXT): src/gdk/gdkpixbuf.pp gdk$(PPUEXT)
+gtk$(PPUEXT): $(wildcard src/gtk/gtk*.pp) gdk$(PPUEXT)
+gtkglarea$(PPUEXT): $(wildcard src/gtkgl/gtkgla*.pp) gdk$(PPUEXT) gtk$(PPUEXT)

packages/gtk1/Makefile.fpc

@@ -14,7 +14,7 @@ units=glib gmodule gdk gtk gdkpixbuf gtkglarea
 exampledirs=examples
 
 [compiler]
-sourcedir=glib gdk gtk gtkgl
+sourcedir=src/glib src/gdk src/gtk src/gtkgl
 
 [install]
 fpcpackage=y
@@ -27,14 +27,14 @@ build=n
 
 [rules]
 .NOTPARALLEL:
-glib$(PPUEXT): $(wildcard glib/glib*.pp)
+glib$(PPUEXT): $(wildcard src/glib/glib*.pp)
 
-gmodule$(PPUEXT): $(wildcard glib/gmodule*.pp) glib$(PPUEXT)
+gmodule$(PPUEXT): $(wildcard src/glib/gmodule*.pp) glib$(PPUEXT)
 
-gdk$(PPUEXT): $(wildcard gdk/gdk*.pp) glib$(PPUEXT)
+gdk$(PPUEXT): $(wildcard src/gdk/gdk*.pp) glib$(PPUEXT)
 
-gdkpixbuf$(PPUEXT): gdk/gdkpixbuf.pp gdk$(PPUEXT)
+gdkpixbuf$(PPUEXT): src/gdk/gdkpixbuf.pp gdk$(PPUEXT)
 
-gtk$(PPUEXT): $(wildcard gtk/gtk*.pp) gdk$(PPUEXT)
+gtk$(PPUEXT): $(wildcard src/gtk/gtk*.pp) gdk$(PPUEXT)
 
-gtkglarea$(PPUEXT): $(wildcard gtkgl/gtkgla*.pp) gdk$(PPUEXT) gtk$(PPUEXT)
+gtkglarea$(PPUEXT): $(wildcard src/gtkgl/gtkgla*.pp) gdk$(PPUEXT) gtk$(PPUEXT)

packages/gtk1/fpmake.pp

@@ -17,10 +17,14 @@ begin
     P.Directory:='gtk1';
 {$endif ALLPACKAGES}
     P.Version:='2.0.0';
-    P.SourcePath.Add('gtk');
-    P.SourcePath.Add('gdk');
-    P.SourcePath.Add('glib');
-    P.SourcePath.Add('gtkgl');
+    P.SourcePath.Add('src/gtk');
+    P.SourcePath.Add('src/gdk');
+    P.SourcePath.Add('src/glib');
+    P.SourcePath.Add('src/gtkgl');
+    P.IncludePath.Add('src/gtk');
+    P.IncludePath.Add('src/gdk');
+    P.IncludePath.Add('src/glib');
+    P.IncludePath.Add('src/gtkgl');
 
     T:=P.Targets.AddUnit('gdkpixbuf.pp');
       with T.Dependencies do