summaryrefslogtreecommitdiffstats
path: root/tkmacosx
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-03-23 17:17:51 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-03-23 17:17:51 (GMT)
commit947a9c9e07cad7a318b7b8bfd667d2f786056830 (patch)
tree2f9d5a67ae754ff1ac40f1537f726a5156761570 /tkmacosx
parent37e45d85c572c8f373e5a37a7080f4b71ce128ee (diff)
downloadblt-947a9c9e07cad7a318b7b8bfd667d2f786056830.zip
blt-947a9c9e07cad7a318b7b8bfd667d2f786056830.tar.gz
blt-947a9c9e07cad7a318b7b8bfd667d2f786056830.tar.bz2
reneame
Diffstat (limited to 'tkmacosx')
-rw-r--r--tkmacosx/Makefile.in10
-rwxr-xr-xtkmacosx/configure6
-rw-r--r--tkmacosx/configure.ac6
-rw-r--r--tkmacosx/macosxlib.M (renamed from tkmacosx/macosxlib.mm)0
-rw-r--r--tkmacosx/tkmacosx.M (renamed from tkmacosx/tkmacosx.mm)0
-rw-r--r--tkmacosx/xxlib.M (renamed from tkmacosx/xxlib.mm)0
6 files changed, 14 insertions, 8 deletions
diff --git a/tkmacosx/Makefile.in b/tkmacosx/Makefile.in
index 2ab79dd..6849188 100644
--- a/tkmacosx/Makefile.in
+++ b/tkmacosx/Makefile.in
@@ -167,7 +167,7 @@ AR = @AR@
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-.SUFFIXES: .c .mm .$(OBJEXT)
+.SUFFIXES: .c .C .m .M .$(OBJEXT)
#========================================================================
# Start of user-definable TARGETS section
@@ -299,7 +299,13 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win:$(srcdir)/macos
.c.@OBJEXT@:
$(COMPILE) -c `@CYGPATH@ $<` -o $@
-.mm.@OBJEXT@:
+.C.@OBJEXT@:
+ $(COMPILE) -c `@CYGPATH@ $<` -o $@
+
+.m.@OBJEXT@:
+ $(COMPILE) -c `@CYGPATH@ $<` -o $@
+
+.M.@OBJEXT@:
$(COMPILE) -c `@CYGPATH@ $<` -o $@
#========================================================================
diff --git a/tkmacosx/configure b/tkmacosx/configure
index 62fda30..45b8b8c 100755
--- a/tkmacosx/configure
+++ b/tkmacosx/configure
@@ -5634,9 +5634,9 @@ done
vars="
- tkmacosx.mm
- macosxlib.mm
- xxlib.mm
+ tkmacosx.M
+ macosxlib.M
+ xxlib.M
"
for i in $vars; do
case $i in
diff --git a/tkmacosx/configure.ac b/tkmacosx/configure.ac
index 9b6a6ef..abd230e 100644
--- a/tkmacosx/configure.ac
+++ b/tkmacosx/configure.ac
@@ -72,9 +72,9 @@ TEA_SETUP_COMPILER
#-----------------------------------------------------------------------
TEA_ADD_SOURCES([
- tkmacosx.mm
- macosxlib.mm
- xxlib.mm
+ tkmacosx.M
+ macosxlib.M
+ xxlib.M
])
TEA_ADD_HEADERS([
macosxlib.h
diff --git a/tkmacosx/macosxlib.mm b/tkmacosx/macosxlib.M
index 65e51a8..65e51a8 100644
--- a/tkmacosx/macosxlib.mm
+++ b/tkmacosx/macosxlib.M
diff --git a/tkmacosx/tkmacosx.mm b/tkmacosx/tkmacosx.M
index 5f44984..5f44984 100644
--- a/tkmacosx/tkmacosx.mm
+++ b/tkmacosx/tkmacosx.M
diff --git a/tkmacosx/xxlib.mm b/tkmacosx/xxlib.M
index 412c56c..412c56c 100644
--- a/tkmacosx/xxlib.mm
+++ b/tkmacosx/xxlib.M