* updated r308 of common Mac OS X interfaces:

   o all headers updated to Mac OS X 10.6
   o 64 bit support (commented out unsupported routines under 64 bit, fixed
     types)
   o iPhoneOS support to the extent that this is available in the standard
     Mac OS X 10.6 headers (these are not covered under the iPhone SDK
     derivative works limitation)
   o a few new frameworks translated: CoreType, CoreVideo, AudioUnits
   o a number of changes can cause compatibility problems with existing
     programs, listed below
  * many cases where signed parameters were turned into unsigned parameters
    and vice versa, too many to list (due to differences between the classic
    Pascal headers and the new C headers)
  * ATSFontFindFromContainer: ioArray var -> ptr because array
  * ATSFontGetFileSpecification: oFile FSSpec -> ATSFSSpec (was translation
    error?)
  * CFNetworkCopyProxiesForAutoConfigurationScript: got extra CFErrorRef para
  * CMGetDeviceFactoryProfiles: defaultProfID var -> ptr, because can be nil
  * CMIterateColorDevices: seed and count var -> ptr, because can be nil
  * CMIterateDeviceProfiles: seed and count var -> ptr, because can be nil
  * CMSetDeviceProfiles: profileScope and deviceProfiles const -> ptr, because 
    can be nil
  * ConvertFromUnicodeToScriptCodeRun: oScriptCodeRuns var -> ptr because
    array
  * ConvertFromUnicodeToTextRun: oEncodingRuns var -> ptr because array
  * CreateUnicodeToTextRunInfo: iUnicodeMappings var -> ptr because array
  * DCMCreateFieldInfoRecord: findMethods var -> ptr because array
  * DCMGetFieldFindMethods: findMethods var -> ptr because array
  * GetIconRefFromFileInfo: outlabel var -> ptr because can be nil
  * HIImageViewCreate: last parameter ControlRef -> HIViewRef
  * HIViewNewTrackingArea: outRef var -> ptr because can be nil in 10.5+
  * LAGetEnvironmentList: environmentList var -> ptr because array
  * LAListAvailableDictionaries: dictionaryList and opened var -> ptr because
    array
  * LSGetApplicationForURL: outAppRef and outAppURL var -> ptr because can be
    nil
  * LocaleOperationGetLocales: localeVariantList var -> ptr because can be nil
  * MPWaitOnQueue: param1-3 value -> var because "void **" in C
  * QTVRSetBackBufferImagingProc: areasOfInterest var -> ptr because array
  * QueryUnicodeMappings: oReturnedMappings var -> ptr because array
  * TECConvertTextToMultipleEncodings: outEncodingsBuffer var -> ptr because
    array
  * TECFlushMultipleEncodings: outEncodingsBuffer var -> ptr because array
  * TECSniffTextEncoding: numErrsArray and numFeaturesArray var -> ptr because
    array
  * FSCreateResFile: catalogInfo const -> ptr because can be nil


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@14089 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 68 insertions, 61 deletions

diff --git a/packages/Makefile b/packages/Makefile
index a061ea775a..2ff58d2e19 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/20]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/08/14]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku 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-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -304,7 +304,7 @@ ifeq ($(FULL_TARGET),i386-wdosx)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra graph univint cocoaint sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms  gnome1 httpd13 httpd20 httpd22 imlib opengles objcrtl
+override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra univint graph sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms  gnome1 httpd13 httpd20 httpd22 imlib opengles objcrtl cocoaint
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv zlib libpng x11 tcl fpgtk rexx os2units gtk1 imlib
@@ -361,7 +361,7 @@ ifeq ($(FULL_TARGET),powerpc-macos)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra graph univint cocoaint sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib objcrtl
+override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra univint graph sdl opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib objcrtl cocoaint
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv opengl
@@ -388,7 +388,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi 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 librsvg httpd13 httpd20 httpd22 pxlib numlib users iconvenc gmp fcl-extra libxml
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib
+override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra univint opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib cocoaint
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv winunits-base winunits-jedi fcl-web fastcgi ibase mysql zlib oracle odbc postgres sqlite imagemagick tcl opengl gtk1 fpgtk fftw sdl openssl cdrom httpd13 httpd20 httpd22 numlib fcl-extra
@@ -403,7 +403,7 @@ ifeq ($(FULL_TARGET),arm-palmos)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  palmunits
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra httpd13 httpd20 httpd22 opengles objcrtl
+override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra univint httpd13 httpd20 httpd22 opengles objcrtl
 endif
 ifeq ($(FULL_TARGET),arm-wince)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  winceunits httpd22 fcl-web fastcgi tcl fftw unzip zlib sqlite mysql ibase postgres oracle odbc sdl openssl oggvorbis numlib
@@ -424,7 +424,7 @@ ifeq ($(FULL_TARGET),powerpc64-linux)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi 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 librsvg a52 bfd aspell svgalib newt cdrom users  iconvenc libxml proj4 fcl-extra imlib utmp  fpgtk openal lua oggvorbis xforms fftw pcap ggi sdl openssl gnome1 httpd13 httpd20 httpd22 pxlib numlib gmp graph
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib
+override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2  fv fcl-web fastcgi fcl-async ibase mysql ncurses zlib oracle odbc postgres sqlite pthreads imagemagick libpng gdbm tcl syslog libcurl bfd aspell utmp fftw pcap openssl numlib iconvenc gmp fcl-extra univint opengl x11 cairo gtk1 gtk2 librsvg fpgtk xforms gnome1 httpd13 httpd20 httpd22 imlib cocoaint
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 override TARGET_DIRS+=hash pasjpeg paszlib fpmkunit fcl-xml fcl-base fcl-db fcl-image fcl-net fcl-passrc fcl-registry fcl-fpcunit fcl-json  fcl-process unzip regexpr chm fcl-res libgd symbolic bzip2
@@ -2283,9 +2283,8 @@ TARGET_DIRS_NUMLIB=1
 TARGET_DIRS_ICONVENC=1
 TARGET_DIRS_GMP=1
 TARGET_DIRS_FCL-EXTRA=1
-TARGET_DIRS_GRAPH=1
 TARGET_DIRS_UNIVINT=1
-TARGET_DIRS_COCOAINT=1
+TARGET_DIRS_GRAPH=1
 TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_X11=1
@@ -2302,6 +2301,7 @@ TARGET_DIRS_HTTPD22=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_OPENGLES=1
 TARGET_DIRS_OBJCRTL=1
+TARGET_DIRS_COCOAINT=1
 endif
 ifeq ($(FULL_TARGET),i386-emx)
 TARGET_DIRS_HASH=1
@@ -3112,9 +3112,8 @@ TARGET_DIRS_NUMLIB=1
 TARGET_DIRS_ICONVENC=1
 TARGET_DIRS_GMP=1
 TARGET_DIRS_FCL-EXTRA=1
-TARGET_DIRS_GRAPH=1
 TARGET_DIRS_UNIVINT=1
-TARGET_DIRS_COCOAINT=1
+TARGET_DIRS_GRAPH=1
 TARGET_DIRS_SDL=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_X11=1
@@ -3130,6 +3129,7 @@ TARGET_DIRS_HTTPD20=1
 TARGET_DIRS_HTTPD22=1
 TARGET_DIRS_IMLIB=1
 TARGET_DIRS_OBJCRTL=1
+TARGET_DIRS_COCOAINT=1
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
 TARGET_DIRS_HASH=1
@@ -3629,6 +3629,7 @@ TARGET_DIRS_NUMLIB=1
 TARGET_DIRS_ICONVENC=1
 TARGET_DIRS_GMP=1
 TARGET_DIRS_FCL-EXTRA=1
+TARGET_DIRS_UNIVINT=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_CAIRO=1
@@ -3642,6 +3643,7 @@ TARGET_DIRS_HTTPD13=1
 TARGET_DIRS_HTTPD20=1
 TARGET_DIRS_HTTPD22=1
 TARGET_DIRS_IMLIB=1
+TARGET_DIRS_COCOAINT=1
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
 TARGET_DIRS_HASH=1
@@ -3877,6 +3879,7 @@ TARGET_DIRS_NUMLIB=1
 TARGET_DIRS_ICONVENC=1
 TARGET_DIRS_GMP=1
 TARGET_DIRS_FCL-EXTRA=1
+TARGET_DIRS_UNIVINT=1
 TARGET_DIRS_HTTPD13=1
 TARGET_DIRS_HTTPD20=1
 TARGET_DIRS_HTTPD22=1
@@ -4154,6 +4157,7 @@ TARGET_DIRS_NUMLIB=1
 TARGET_DIRS_ICONVENC=1
 TARGET_DIRS_GMP=1
 TARGET_DIRS_FCL-EXTRA=1
+TARGET_DIRS_UNIVINT=1
 TARGET_DIRS_OPENGL=1
 TARGET_DIRS_X11=1
 TARGET_DIRS_CAIRO=1
@@ -4167,6 +4171,7 @@ TARGET_DIRS_HTTPD13=1
 TARGET_DIRS_HTTPD20=1
 TARGET_DIRS_HTTPD22=1
 TARGET_DIRS_IMLIB=1
+TARGET_DIRS_COCOAINT=1
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
 TARGET_DIRS_HASH=1
@@ -8463,51 +8468,6 @@ univint:
 	$(MAKE) -C univint all
 .PHONY: univint_all univint_debug univint_smart univint_release univint_units univint_examples univint_shared univint_install univint_sourceinstall univint_exampleinstall univint_distinstall univint_zipinstall univint_zipsourceinstall univint_zipexampleinstall univint_zipdistinstall univint_clean univint_distclean univint_cleanall univint_info univint_makefiles univint
 endif
-ifdef TARGET_DIRS_COCOAINT
-cocoaint_all:
-	$(MAKE) -C cocoaint all
-cocoaint_debug:
-	$(MAKE) -C cocoaint debug
-cocoaint_smart:
-	$(MAKE) -C cocoaint smart
-cocoaint_release:
-	$(MAKE) -C cocoaint release
-cocoaint_units:
-	$(MAKE) -C cocoaint units
-cocoaint_examples:
-	$(MAKE) -C cocoaint examples
-cocoaint_shared:
-	$(MAKE) -C cocoaint shared
-cocoaint_install:
-	$(MAKE) -C cocoaint install
-cocoaint_sourceinstall:
-	$(MAKE) -C cocoaint sourceinstall
-cocoaint_exampleinstall:
-	$(MAKE) -C cocoaint exampleinstall
-cocoaint_distinstall:
-	$(MAKE) -C cocoaint distinstall
-cocoaint_zipinstall:
-	$(MAKE) -C cocoaint zipinstall
-cocoaint_zipsourceinstall:
-	$(MAKE) -C cocoaint zipsourceinstall
-cocoaint_zipexampleinstall:
-	$(MAKE) -C cocoaint zipexampleinstall
-cocoaint_zipdistinstall:
-	$(MAKE) -C cocoaint zipdistinstall
-cocoaint_clean:
-	$(MAKE) -C cocoaint clean
-cocoaint_distclean:
-	$(MAKE) -C cocoaint distclean
-cocoaint_cleanall:
-	$(MAKE) -C cocoaint cleanall
-cocoaint_info:
-	$(MAKE) -C cocoaint info
-cocoaint_makefiles:
-	$(MAKE) -C cocoaint makefiles
-cocoaint:
-	$(MAKE) -C cocoaint all
-.PHONY: cocoaint_all cocoaint_debug cocoaint_smart cocoaint_release cocoaint_units cocoaint_examples cocoaint_shared cocoaint_install cocoaint_sourceinstall cocoaint_exampleinstall cocoaint_distinstall cocoaint_zipinstall cocoaint_zipsourceinstall cocoaint_zipexampleinstall cocoaint_zipdistinstall cocoaint_clean cocoaint_distclean cocoaint_cleanall cocoaint_info cocoaint_makefiles cocoaint
-endif
 ifdef TARGET_DIRS_OPENGLES
 opengles_all:
 	$(MAKE) -C opengles all
@@ -8598,6 +8558,51 @@ objcrtl:
 	$(MAKE) -C objcrtl all
 .PHONY: objcrtl_all objcrtl_debug objcrtl_smart objcrtl_release objcrtl_units objcrtl_examples objcrtl_shared objcrtl_install objcrtl_sourceinstall objcrtl_exampleinstall objcrtl_distinstall objcrtl_zipinstall objcrtl_zipsourceinstall objcrtl_zipexampleinstall objcrtl_zipdistinstall objcrtl_clean objcrtl_distclean objcrtl_cleanall objcrtl_info objcrtl_makefiles objcrtl
 endif
+ifdef TARGET_DIRS_COCOAINT
+cocoaint_all:
+	$(MAKE) -C cocoaint all
+cocoaint_debug:
+	$(MAKE) -C cocoaint debug
+cocoaint_smart:
+	$(MAKE) -C cocoaint smart
+cocoaint_release:
+	$(MAKE) -C cocoaint release
+cocoaint_units:
+	$(MAKE) -C cocoaint units
+cocoaint_examples:
+	$(MAKE) -C cocoaint examples
+cocoaint_shared:
+	$(MAKE) -C cocoaint shared
+cocoaint_install:
+	$(MAKE) -C cocoaint install
+cocoaint_sourceinstall:
+	$(MAKE) -C cocoaint sourceinstall
+cocoaint_exampleinstall:
+	$(MAKE) -C cocoaint exampleinstall
+cocoaint_distinstall:
+	$(MAKE) -C cocoaint distinstall
+cocoaint_zipinstall:
+	$(MAKE) -C cocoaint zipinstall
+cocoaint_zipsourceinstall:
+	$(MAKE) -C cocoaint zipsourceinstall
+cocoaint_zipexampleinstall:
+	$(MAKE) -C cocoaint zipexampleinstall
+cocoaint_zipdistinstall:
+	$(MAKE) -C cocoaint zipdistinstall
+cocoaint_clean:
+	$(MAKE) -C cocoaint clean
+cocoaint_distclean:
+	$(MAKE) -C cocoaint distclean
+cocoaint_cleanall:
+	$(MAKE) -C cocoaint cleanall
+cocoaint_info:
+	$(MAKE) -C cocoaint info
+cocoaint_makefiles:
+	$(MAKE) -C cocoaint makefiles
+cocoaint:
+	$(MAKE) -C cocoaint all
+.PHONY: cocoaint_all cocoaint_debug cocoaint_smart cocoaint_release cocoaint_units cocoaint_examples cocoaint_shared cocoaint_install cocoaint_sourceinstall cocoaint_exampleinstall cocoaint_distinstall cocoaint_zipinstall cocoaint_zipsourceinstall cocoaint_zipexampleinstall cocoaint_zipdistinstall cocoaint_clean cocoaint_distclean cocoaint_cleanall cocoaint_info cocoaint_makefiles cocoaint
+endif
 ifdef TARGET_DIRS_AMUNITS
 amunits_all:
 	$(MAKE) -C amunits all
@@ -8737,17 +8742,12 @@ fcl-extra_smart: fcl-base_smart winunits-base_smart winunits-jedi_smart
 fcl-extra_release: fcl-base_release winunits-base_release winunits-jedi_release
 fcl-extra_shared: fcl-base_shared winunits-base_shared winunits-jedi_shared
 else
-ifneq ($(findstring $(FULL_TARGET),powerpc-darwin i386-darwin),)
+ifneq ($(findstring $(OS_TARGET),darwin darwin),)
 fcl-extra_all: univint_all fcl-base_all
 fcl-extra_debug: univint_debug fcl-base_debug
 fcl-extra_smart: univint_smart fcl-base_release
 fcl-extra_release: univint_release fcl-base_release
 fcl-extra_shared: univint_shared fcl-base_shared
-cocoaint_all: univint_all
-cocoaint_debug: univint_debug
-cocoaint_smart: univint_smart
-cocoaint_release: univint_release
-cocoaint_shared: univint_shared
 else
 fcl-extra_all: fcl-base_all
 fcl-extra_debug: fcl-base_debug
@@ -8756,6 +8756,13 @@ fcl-extra_release: fcl-base_release
 fcl-extra_shared: fcl-base_shared
 endif
 endif
+ifneq ($(findstring $(FULL_TARGET),i386-darwin powerpc-darwin x86_64-darwin powerpc64-darwin),)
+cocoaint_all: univint_all
+cocoaint_debug: univint_debug
+cocoaint_smart: univint_smart
+cocoaint_release: univint_release
+cocoaint_shared: univint_shared
+endif
 fcl-xml_all: fcl-base_all
 fcl-xml_debug: fcl-base_debug
 fcl-xml_smart: fcl-base_smart