summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-23 13:37:04 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-10-23 13:37:04 (GMT)
commit40af4f0e8c40ef3a1bc01189d45ddd921cc14550 (patch)
treea9da7654820286bfa57e894a9a1fb8e4de69b33c /unix/Makefile.in
parent27afd154a9fc5f72d7a829b285c340766ef8c6ce (diff)
parent2057f61af78500da2956bf3aa83cc10878e93d09 (diff)
downloadtk-40af4f0e8c40ef3a1bc01189d45ddd921cc14550.zip
tk-40af4f0e8c40ef3a1bc01189d45ddd921cc14550.tar.gz
tk-40af4f0e8c40ef3a1bc01189d45ddd921cc14550.tar.bz2
sync nmakehlp.c with Tcl version
<p>purge spaces at end of lines <p>clean-up unix/Makefile.in after carbon removal
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in41
1 files changed, 12 insertions, 29 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 2de275c..1df6721 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -312,7 +312,7 @@ UNIX_DIR = $(TOP_DIR)/unix
BMAP_DIR = $(TOP_DIR)/bitmaps
TOOL_DIR = @TCL_SRC_DIR@/tools
TEST_DIR = $(TOP_DIR)/tests
-MAC_OSX_DIR = $(TOP_DIR)/@MACOSX_SRC_DIR@
+MAC_OSX_DIR = $(TOP_DIR)/macosx
XLIB_DIR = $(TOP_DIR)/xlib
#----------------------------------------------------------------
@@ -801,7 +801,7 @@ install-libraries: libraries
done;
install-demos:
- @for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)"/images ; \
+ @for i in "$(DEMO_INSTALL_DIR)" "$(DEMO_INSTALL_DIR)/images" ; \
do \
if [ ! -d "$$i" ] ; then \
echo "Making directory $$i"; \
@@ -873,7 +873,7 @@ install-headers:
done;
@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \
do \
- $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)"/X11; \
+ $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \
done;
# Optional target to install private headers
@@ -1327,9 +1327,6 @@ tkMacOSXWm.o: $(MAC_OSX_DIR)/tkMacOSXWm.c
tkMacOSXXStubs.o: $(MAC_OSX_DIR)/tkMacOSXXStubs.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXXStubs.c
-tkMacOSXCarbonEvents.o: $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c
- $(CC) -c $(CC_SWITCHES) $(TOP_DIR)/carbon/tkMacOSXCarbonEvents.c
-
tkFileFilter.o: $(GENERIC_DIR)/tkFileFilter.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkFileFilter.c
@@ -1593,35 +1590,21 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(M
$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc
$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/wish.exe.manifest.in
mkdir $(DISTDIR)/macosx
- cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \
- $(TOP_DIR)/macosx/*.icns $(TOP_DIR)/macosx/*.tiff \
- $(TOP_DIR)/macosx/*.[ch] $(TOP_DIR)/macosx/*.in \
- $(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \
- $(TOP_DIR)/macosx/*.sdef $(TOP_DIR)/macosx/configure \
+ cp -p $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
+ $(MAC_OSX_DIR)/*.icns $(MAC_OSX_DIR)/*.tiff \
+ $(MAC_OSX_DIR)/*.[ch] $(MAC_OSX_DIR)/*.in \
+ $(MAC_OSX_DIR)/*.ac $(MAC_OSX_DIR)/*.xcconfig \
+ $(MAC_OSX_DIR)/*.sdef $(MAC_OSX_DIR)/configure \
$(DISTDIR)/macosx
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
mkdir $(DISTDIR)/macosx/Tk.xcode
- cp -p $(TOP_DIR)/macosx/Tk.xcode/project.pbxproj \
- $(TOP_DIR)/macosx/Tk.xcode/default.pbxuser \
+ cp -p $(MAC_OSX_DIR)/Tk.xcode/project.pbxproj \
+ $(MAC_OSX_DIR)/Tk.xcode/default.pbxuser \
$(DISTDIR)/macosx/Tk.xcode
mkdir $(DISTDIR)/macosx/Tk.xcodeproj
- cp -p $(TOP_DIR)/macosx/Tk.xcodeproj/project.pbxproj \
- $(TOP_DIR)/macosx/Tk.xcodeproj/default.pbxuser \
+ cp -p $(MAC_OSX_DIR)/Tk.xcodeproj/project.pbxproj \
+ $(MAC_OSX_DIR)/Tk.xcodeproj/default.pbxuser \
$(DISTDIR)/macosx/Tk.xcodeproj
- mkdir $(DISTDIR)/carbon
- cp -p $(TOP_DIR)/carbon/GNUmakefile $(TOP_DIR)/carbon/README \
- $(TOP_DIR)/carbon/Wish.icns $(TOP_DIR)/carbon/*.[chr] \
- $(TOP_DIR)/carbon/*.in $(TOP_DIR)/carbon/*.ac \
- $(TOP_DIR)/carbon/*.xcconfig $(DISTDIR)/carbon
- cp -p $(TOP_DIR)/license.terms $(DISTDIR)/carbon
- mkdir $(DISTDIR)/carbon/Wish.xcode
- cp -p $(TOP_DIR)/carbon/Wish.xcode/project.pbxproj \
- $(TOP_DIR)/carbon/Wish.xcode/default.pbxuser \
- $(DISTDIR)/carbon/Wish.xcode
- mkdir $(DISTDIR)/carbon/Wish.xcodeproj
- cp -p $(TOP_DIR)/carbon/Wish.xcodeproj/project.pbxproj \
- $(TOP_DIR)/carbon/Wish.xcodeproj/default.pbxuser \
- $(DISTDIR)/carbon/Wish.xcodeproj
mkdir $(DISTDIR)/compat
cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
$(TCLDIR)/compat/stdlib.h $(TCLDIR)/compat/limits.h \