summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-06 13:59:38 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-10-06 13:59:38 (GMT)
commit85c9143fa9cf944abf9578dd6bf22ce4cc37a868 (patch)
tree4859c4e43f33ef28bec0bfe20501f4bf4a2ab077 /unix/Makefile.in
parent4a66cff1ca1d31e2091709e7652916b6e7cbb10d (diff)
parent1cd8a9a6fda312a5dc2bff787db9cae05071fef6 (diff)
downloadtk-85c9143fa9cf944abf9578dd6bf22ce4cc37a868.zip
tk-85c9143fa9cf944abf9578dd6bf22ce4cc37a868.tar.gz
tk-85c9143fa9cf944abf9578dd6bf22ce4cc37a868.tar.bz2
Merge trunk. Rename tkMacOSXSysTray.c and fix MacOSX (UNIX) Makefile.in for it
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7faca90..addd297 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -539,7 +539,7 @@ AQUA_SRCS = \
$(MAC_OSX_DIR)/tkMacOSXMenubutton.c $(MAC_OSX_DIR)/tkMacOSXMenus.c \
$(MAC_OSX_DIR)/tkMacOSXMouseEvent.c $(MAC_OSX_DIR)/tkMacOSXNotify.c \
$(MAC_OSX_DIR)/tkMacOSXRegion.c $(MAC_OSX_DIR)/tkMacOSXScrlbr.c \
- $(MAC_OSX_DIR)/tkMacOSXServices.c \
+ $(MAC_OSX_DIR)/tkMacOSXServices.c $(MAC_OSX_DIR)/tkMacOSXSysTray.c \
$(MAC_OSX_DIR)/tkMacOSXSend.c $(MAC_OSX_DIR)/tkMacOSXSubwindows.c \
$(MAC_OSX_DIR)/tkMacOSXTest.c $(MAC_OSX_DIR)/tkMacOSXWindowEvent.c \
$(MAC_OSX_DIR)/tkMacOSXWm.c $(MAC_OSX_DIR)/tkMacOSXXStubs.c \
@@ -1379,7 +1379,7 @@ tkMacOSXWm.o: $(MAC_OSX_DIR)/tkMacOSXWm.c
tkMacOSXXStubs.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXXStubs.c
-tkMacOSXSysTray.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
+tkMacOSXSysTray.o: $(MAC_OSX_DIR)/tkMacOSXSysTray.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXSysTray.c
tkFileFilter.o: $(GENERIC_DIR)/tkFileFilter.c