From 6d6ed769621f15c51a3a3de78f56de3d0c73b505 Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Tue, 13 Aug 2002 07:43:46 +0000
Subject: [PATCH] + Added from lazarus project

---
 packages/extra/gtk/Makefile     | 76 ++-------------------------------
 packages/extra/gtk/Makefile.fpc |  4 +-
 2 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/packages/extra/gtk/Makefile b/packages/extra/gtk/Makefile
index 8dec5e8386..4399404a0d 100644
--- a/packages/extra/gtk/Makefile
+++ b/packages/extra/gtk/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/08/01]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/05/22]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx
+MAKEFILETARGETS=linux win32
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -42,9 +42,6 @@ endif
 ifeq ($(OS_TARGET),netbsd)
 BSDhier=1
 endif
-ifeq ($(OS_TARGET),openbsd)
-BSDhier=1
-endif
 ifdef inUnix
 BATCHEXT=.sh
 else
@@ -202,7 +199,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=gtk
 override PACKAGE_VERSION=1.0.6
 override TARGET_DIRS+=gtkgl
-override TARGET_UNITS+=glib gmodule gdk gtk
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 override TARGET_EXAMPLEDIRS+=examples
 override INSTALL_FPCPACKAGE=y
 override COMPILER_SOURCEDIR+=glib gdk gtk
@@ -223,9 +220,6 @@ endif
 ifeq ($(OS_TARGET),netbsd)
 UNIXINSTALLDIR=1
 endif
-ifeq ($(OS_TARGET),openbsd)
-UNIXINSTALLDIR=1
-endif
 ifeq ($(OS_TARGET),sunos)
 UNIXINSTALLDIR=1
 endif
@@ -242,9 +236,6 @@ endif
 ifeq ($(OS_SOURCE),netbsd)
 UNIXINSTALLDIR=1
 endif
-ifeq ($(OS_SOURCE),openbsd)
-UNIXINSTALLDIR=1
-endif
 ifeq ($(OS_TARGET),sunos)
 UNIXINSTALLDIR=1
 endif
@@ -460,12 +451,6 @@ HASSHAREDLIB=1
 FPCMADE=fpcmade.netbsd
 ZIPSUFFIX=netbsd
 endif
-ifeq ($(OS_TARGET),openbsd)
-EXEEXT=
-HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
-endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
 OEXT=.ow
@@ -777,61 +762,10 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
-ifeq ($(OS_TARGET),go32v2)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
-ifeq ($(OS_TARGET),os2)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),freebsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),beos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),netbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),amiga)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),atari)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),sunos)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),qnx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),netware)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),openbsd)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
-ifeq ($(OS_TARGET),wdosx)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
 ifneq ($(PACKAGEDIR_RTL),)
@@ -916,9 +850,6 @@ endif
 ifneq ($(OS_TARGET),$(OS_SOURCE))
 override FPCOPT+=-T$(OS_TARGET)
 endif
-ifeq ($(OS_SOURCE),openbsd)
-override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
-endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1490,4 +1421,5 @@ endif
 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)
diff --git a/packages/extra/gtk/Makefile.fpc b/packages/extra/gtk/Makefile.fpc
index 3a077529a0..14fadfa93e 100644
--- a/packages/extra/gtk/Makefile.fpc
+++ b/packages/extra/gtk/Makefile.fpc
@@ -11,7 +11,7 @@ libc=y
 
 [target]
 dirs=gtkgl
-units=glib gmodule gdk gtk
+units=glib gmodule gdk gtk gdkpixbuf
 exampledirs=examples
 
 [compiler]
@@ -36,4 +36,6 @@ 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)