[26176] branches/dp2mp-move/base

[source_changes at macosforge.org]

Revision: 26176
          http://trac.macosforge.org/projects/macports/changeset/26176
Author:   jmpp at macports.org
Date:     2007-06-15 02:27:18 -0700 (Fri, 15 Jun 2007)

Log Message:
-----------
Merging the necessary part of landonf's r26137: A prototype dynamic Tcl -> Objective-C bridge.

Modified Paths:
--------------
    branches/dp2mp-move/base/Mk/macports.autoconf.mk.in
    branches/dp2mp-move/base/Mk/macports.tea.mk
    branches/dp2mp-move/base/configure
    branches/dp2mp-move/base/configure.ac
    branches/dp2mp-move/base/src/Makefile.in

Modified: branches/dp2mp-move/base/Mk/macports.autoconf.mk.in
===================================================================
--- branches/dp2mp-move/base/Mk/macports.autoconf.mk.in	2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/Mk/macports.autoconf.mk.in	2007-06-15 09:27:18 UTC (rev 26176)
@@ -6,7 +6,7 @@
 
 CC			= @CC@
 CFLAGS			= @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
-OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) ${CFLAGS_DEBUG}  $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
+OBJCFLAGS		= @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG}  $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
 CPPFLAGS		= @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
 TCL_DEFS		= @TCL_DEFS@
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@

Modified: branches/dp2mp-move/base/Mk/macports.tea.mk
===================================================================
--- branches/dp2mp-move/base/Mk/macports.tea.mk	2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/Mk/macports.tea.mk	2007-06-15 09:27:18 UTC (rev 26176)
@@ -1,3 +1,8 @@
+.SUFFIXES: .m
+
+.m.o:
+	${CC} -c -DUSE_TCL_STUBS ${OBJCFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
+
 .c.o:
 	${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
 

Modified: branches/dp2mp-move/base/configure
===================================================================
--- branches/dp2mp-move/base/configure	2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/configure	2007-06-15 09:27:18 UTC (rev 26176)
@@ -11249,7 +11249,7 @@
 
 
 # Output
-ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
+ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
 
 
 cat >confcache <<\_ACEOF
@@ -11814,6 +11814,7 @@
     "doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
+    "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
     "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
     "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
     "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;

Modified: branches/dp2mp-move/base/configure.ac
===================================================================
--- branches/dp2mp-move/base/configure.ac	2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/configure.ac	2007-06-15 09:27:18 UTC (rev 26176)
@@ -275,6 +275,7 @@
 	doc/macports.conf
 	src/Makefile
 	src/macports1.0/macports_autoconf.tcl
+	src/tclobjc1.0/Makefile
 	src/port1.0/port_autoconf.tcl
 	src/registry1.0/registry_autoconf.tcl
 	src/programs/Makefile

Modified: branches/dp2mp-move/base/src/Makefile.in
===================================================================
--- branches/dp2mp-move/base/src/Makefile.in	2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/src/Makefile.in	2007-06-15 09:27:18 UTC (rev 26176)
@@ -1,5 +1,5 @@
 TCLPKG=		@OUR_INCLUDED_PACKAGES@ macports1.0 port1.0 package1.0 \
-			pextlib1.0 registry1.0 darwintracelib1.0 
+			pextlib1.0 registry1.0 darwintracelib1.0 tclobjc1.0
 SUBDIR=		${TCLPKG} port programs
 
 all::

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070615/050bf0ec/attachment.html