- don't compile sdl for darwin/ppc64 and darwin/x86_64 (it also wasn't

    in the past)
  * graph does not depend on sdl for go32v2 (sdl is not compiled for go32v2)
  * sdl does not depend on pthreads and x11 for non-unix
  * opengl does not depend on x11 for non-unix
  - removed duplicated opengl dependencies declaration  

git-svn-id: trunk@10060 -

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# 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 [2008/01/06]
 #
 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
@@ -277,7 +277,7 @@ ifeq ($(FULL_TARGET),i386-wdosx)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1 graph univint
+override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi openssl gnome1 graph univint sdl
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  zlib  libpng x11 tcl fpgtk rexx os2units gtk1 imlib
@@ -334,7 +334,7 @@ ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1 graph univint
+override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi openssl gnome1 graph univint sdl
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib
@@ -361,7 +361,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick gdbint libpng x11 gdbm tcl syslog libcurl opengl cairo  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1
+override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi openssl gnome1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  winunits-base winunits-jedi fcl-web ibase mysql zlib oracle odbc postgres sqlite imagemagick tcl opengl gtk1 gtk2  fpgtk fftw sdl openssl cdrom
@@ -394,7 +394,7 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses unzip zlib oracle dbus odbc postgres sqlite pthreads imagemagick gdbint libpng x11 uuid ldap modplug dts mad  gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  a52 bfd aspell svgalib newt cdrom users  imlib utmp  fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 graph
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1
+override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib  fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib imlib utmp  fpgtk xforms fftw pcap ggi openssl gnome1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=base fv hash pasjpeg paszlib fpmkunit fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-xml fcl-fpcunit fcl-json  fcl-process unzip regexpr chm numlib
@@ -2044,11 +2044,11 @@ TARGET_DIRS_XFORMS=1
 TARGET_DIRS_FFTW=1
 TARGET_DIRS_PCAP=1
 TARGET_DIRS_GGI=1
-TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENSSL=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_GRAPH=1
 TARGET_DIRS_UNIVINT=1
+TARGET_DIRS_SDL=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_BASE=1
@@ -2768,11 +2768,11 @@ TARGET_DIRS_XFORMS=1
 TARGET_DIRS_FFTW=1
 TARGET_DIRS_PCAP=1
 TARGET_DIRS_GGI=1
-TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENSSL=1
 TARGET_DIRS_GNOME1=1
 TARGET_DIRS_GRAPH=1
 TARGET_DIRS_UNIVINT=1
+TARGET_DIRS_SDL=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 TARGET_DIRS_BASE=1
@@ -3211,7 +3211,6 @@ TARGET_DIRS_XFORMS=1
 TARGET_DIRS_FFTW=1
 TARGET_DIRS_PCAP=1
 TARGET_DIRS_GGI=1
-TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENSSL=1
 TARGET_DIRS_GNOME1=1
 endif
@@ -3619,7 +3618,6 @@ TARGET_DIRS_XFORMS=1
 TARGET_DIRS_FFTW=1
 TARGET_DIRS_PCAP=1
 TARGET_DIRS_GGI=1
-TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENSSL=1
 TARGET_DIRS_GNOME1=1
 endif
@@ -7305,11 +7303,6 @@ libpng_debug: zlib_debug
 libpng_smart: zlib_smart
 libpng_release: zlib_release
 libpng_shared: zlib_shared
-opengl_all: x11_all
-opengl_debug: x11_debug
-opengl_smart: x11_smart
-opengl_release: x11_release
-opengl_shared: x11_shared
 gtk1_all: x11_all
 gtk1_debug: x11_debug
 gtk1_smart: x11_smart
@@ -7330,11 +7323,13 @@ fpgtk_shared: fcl-base_shared gtk1_shared
 fpgtk_smart: fcl-base_smart gtk1_smart
 fpgtk_debug: fcl-base_debug gtk1_debug
 fpgtk_release: fcl-base_release gtk1_release
+ifneq ($(findstring $(OS_TARGET),go32v2),)
 graph_all: sdl_all 
 graph_shared: sdl_shared 
 graph_smart: sdl_smart 
 graph_debug: sdl_debug 
 graph_release: sdl_release 
+endif
 gtk2_all: x11_all 
 gtk2_shared: x11_shared 
 gtk2_smart: x11_smart 
@@ -7355,21 +7350,23 @@ libpng_shared: zlib_shared
 libpng_smart: zlib_smart
 libpng_debug: zlib_debug
 libpng_release: zlib_release
-opengl_all: x11_all x11_all x11_all x11_all x11_all
-opengl_shared: x11_shared x11_shared x11_shared x11_shared x11_shared
-opengl_smart: x11_smart x11_smart x11_smart x11_smart x11_smart
-opengl_debug: x11_debug x11_debug x11_debug x11_debug x11_debug
-opengl_release: x11_release x11_release x11_release x11_release x11_release
 paszlib_all: hash_all
 paszlib_shared: hash_shared
 paszlib_smart: hash_smart
 paszlib_debug: hash_debug
 paszlib_release: hash_release
+ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
 sdl_all: pthreads_all x11_all
 sdl_shared: pthreads_shared x11_shared
 sdl_smart: pthreads_smart x11_smart
 sdl_debug: pthreads_debug x11_debug
 sdl_release: pthreads_release x11_release
+opengl_all: x11_all
+opengl_shared: x11_shared
+opengl_smart: x11_smart
+opengl_debug: x11_debug
+opengl_release: x11_release
+endif
 tcl_all: fcl-base_all
 tcl_shared: fcl-base_shared
 tcl_smart: fcl-base_smart

packages/Makefile.fpc

@@ -17,9 +17,9 @@ dirs_freebsd=fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sql
                imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl graph gnome1 gtk1 gtk2
 dirs_darwin=fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
                 libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 gtk2  bfd aspell svgalib \
-               imlib utmp  fpgtk xforms fftw pcap ggi sdl openssl gnome1
-dirs_i386_darwin=graph univint
-dirs_powerpc_darwin=graph univint
+               imlib utmp  fpgtk xforms fftw pcap ggi openssl gnome1
+dirs_i386_darwin=graph univint sdl
+dirs_powerpc_darwin=graph univint sdl
 dirs_solaris=fcl-web fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick \
                libpng x11 gdbm tcl syslog libcurl opengl cairo gtk1 bfd aspell svgalib \
                imlib utmp  fpgtk xforms fftw pcap ggi  openssl gnome1
@@ -151,12 +151,6 @@ libpng_smart: zlib_smart
 libpng_release: zlib_release
 libpng_shared: zlib_shared
 
-opengl_all: x11_all
-opengl_debug: x11_debug
-opengl_smart: x11_smart
-opengl_release: x11_release
-opengl_shared: x11_shared
-
 gtk1_all: x11_all
 gtk1_debug: x11_debug
 gtk1_smart: x11_smart
@@ -181,11 +175,13 @@ fpgtk_smart: fcl-base_smart gtk1_smart
 fpgtk_debug: fcl-base_debug gtk1_debug
 fpgtk_release: fcl-base_release gtk1_release
 
+ifneq ($(findstring $(OS_TARGET),go32v2),)
 graph_all: sdl_all 
 graph_shared: sdl_shared 
 graph_smart: sdl_smart 
 graph_debug: sdl_debug 
 graph_release: sdl_release 
+endif
 
 gtk2_all: x11_all 
 gtk2_shared: x11_shared 
@@ -211,24 +207,26 @@ libpng_smart: zlib_smart
 libpng_debug: zlib_debug
 libpng_release: zlib_release
 
-opengl_all: x11_all x11_all x11_all x11_all x11_all
-opengl_shared: x11_shared x11_shared x11_shared x11_shared x11_shared
-opengl_smart: x11_smart x11_smart x11_smart x11_smart x11_smart
-opengl_debug: x11_debug x11_debug x11_debug x11_debug x11_debug
-opengl_release: x11_release x11_release x11_release x11_release x11_release
-
 paszlib_all: hash_all
 paszlib_shared: hash_shared
 paszlib_smart: hash_smart
 paszlib_debug: hash_debug
 paszlib_release: hash_release
 
+ifneq ($(findstring $(OS_TARGET),linux darwin freebsd openbsd netbsd solaris),)
 sdl_all: pthreads_all x11_all
 sdl_shared: pthreads_shared x11_shared
 sdl_smart: pthreads_smart x11_smart
 sdl_debug: pthreads_debug x11_debug
 sdl_release: pthreads_release x11_release
 
+opengl_all: x11_all
+opengl_shared: x11_shared
+opengl_smart: x11_smart
+opengl_debug: x11_debug
+opengl_release: x11_release
+endif
+
 tcl_all: fcl-base_all
 tcl_shared: fcl-base_shared
 tcl_smart: fcl-base_smart