From f3c7efc8d2feb9a67b6fdff09f4f428125eb5b79 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 17 Dec 2010 10:43:41 +0000
Subject: The 3 objective-c++ files used for the Mac OS X support are no longer
 included by other files but added to the list of source files to be compiled
 for Mac OS X only. Support files for autoconf/configure/make, CMake and Xcode
 are also modified accordingly.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 makeinclude.in | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'makeinclude.in')

diff --git a/makeinclude.in b/makeinclude.in
index fb0d287fa..b023e1481 100644
--- a/makeinclude.in
+++ b/makeinclude.in
@@ -36,7 +36,7 @@ mandir		= @mandir@
 srcdir		= @srcdir@
 docdir		= $(datadir)/doc/fltk
 VPATH		= @srcdir@
-
+USEMMFILES  = @USEMMFILES@
 # programs we use...
 HTMLDOC		= @HTMLDOC@
 DOXYDOC		= @DOXYDOC@
@@ -143,7 +143,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 .SILENT:
 
 # Build commands and filename extensions...
-.SUFFIXES:	.0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
+.SUFFIXES:	.0 .1 .3 .6 .c .cxx .mm .h .fl .man .o .z $(EXEEXT)
 
 .o$(EXEEXT):
 	echo Linking $@...
@@ -155,15 +155,12 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
 
 .cxx.o:
 	echo Compiling $<...
-	@if test `uname` = Darwin -a $< = Fl.cxx ; then \
-		$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -x objective-c++ -c $< -o $@; \
-	elif test `uname` = Darwin -a  $< = Fl_Native_File_Chooser.cxx ; then \
-		$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -x objective-c++ -c $< -o $@; \
-	elif test `uname` = Darwin -a  $< = Fl_Printer.cxx ; then \
-		$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -x objective-c++ -c $< -o $@; \
-	else \
-		$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@; \
-	fi
+	$(CXX) -I.. $(ARCHFLAGS) @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $< -o $@
+	
+.mm.o:
+	echo Compiling $<...
+	$(CXX) -I.. $(ARCHFLAGS) $(CXXFLAGS) -x objective-c++ -c $< -o $@
+
 
 .man.0 .man.1 .man.3 .man.6:
 	echo Formatting $<...
-- 
cgit v1.2.3