Merged revisions 11097 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
r11097 | hajny | 2008-05-27 19:58:45 +0000 (Tue, 27 May 2008) | 1 line

  * avoid dependency from gtk1 to opengl on os2
........

git-svn-id: branches/fixes_2_2@11098 -

packages/Makefile

@@ -7899,12 +7899,14 @@ gtk2_smart: x11_smart
 gtk2_debug: x11_debug
 gtk2_release: x11_release
 else
+ifeq ($(findstring $(OS_TARGET),os2 emx),)
 gtk1_all:  opengl_all
 gtk1_debug:  opengl_debug
 gtk1_smart:  opengl_smart
 gtk1_release:  opengl_release
 gtk1_shared:  opengl_shared
 endif
+endif
 imlib_all: gtk1_all x11_all
 imlib_shared: gtk1_shared x11_shared
 imlib_smart: gtk1_smart x11_smart

packages/Makefile.fpc

@@ -215,12 +215,14 @@ gtk2_smart: x11_smart
 gtk2_debug: x11_debug
 gtk2_release: x11_release
 else
+ifeq ($(findstring $(OS_TARGET),os2 emx),)
 gtk1_all:  opengl_all
 gtk1_debug:  opengl_debug
 gtk1_smart:  opengl_smart
 gtk1_release:  opengl_release
 gtk1_shared:  opengl_shared
 endif
+endif
 
 imlib_all: gtk1_all x11_all
 imlib_shared: gtk1_shared x11_shared

packages/gtk1/Makefile

@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/01/26]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/03]
 #
 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
+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-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx
 LIMIT83fs = go32v2 os2 emx watcom
@@ -243,163 +243,160 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F
 override PACKAGE_NAME=gtk1
 override PACKAGE_VERSION=2.0.0
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
-endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf  gtkglarea
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf gtkglarea
+override TARGET_UNITS+=glib gmodule gdk gtk gdkpixbuf
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override TARGET_EXAMPLEDIRS+=examples
@@ -521,9 +518,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_EXAMPLEDIRS+=examples
 endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_EXAMPLEDIRS+=examples
-endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_EXAMPLEDIRS+=examples
 endif
@@ -681,9 +675,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
-endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override COMPILER_SOURCEDIR+=src/glib src/gdk src/gtk src/gtkgl
 endif
@@ -1677,11 +1668,6 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_X11=1
 REQUIRE_PACKAGES_OPENGL=1
 endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_X11=1
-REQUIRE_PACKAGES_OPENGL=1
-endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_OPENGL=1
@@ -1971,7 +1957,7 @@ endif
 endif
 endif
 .PHONY: fpc_units
-ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)
+ifneq ($(TARGET_UNITS),)
 override ALLTARGET+=fpc_units
 override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
 override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
@@ -2524,9 +2510,6 @@ endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif
-ifeq ($(FULL_TARGET),x86_64-darwin)
-TARGET_EXAMPLEDIRS_EXAMPLES=1
-endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_EXAMPLEDIRS_EXAMPLES=1
 endif

packages/gtk1/Makefile.fpc

@@ -11,7 +11,16 @@ libc=y
 packages=opengl
 
 [target]
-units=glib gmodule gdk gtk gdkpixbuf gtkglarea
+units=glib gmodule gdk gtk gdkpixbuf
+units_beos=gtkglarea
+units_freebsd=gtkglarea
+units_darwin=gtkglarea
+units_solaris=gtkglarea
+units_netbsd=gtkglarea
+units_openbsd=gtkglarea
+units_linux=gtkglarea
+units_win32=gtkglarea
+units_win64=gtkglarea
 exampledirs=examples
 
 [compiler]