summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-28 15:11:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-01-28 15:11:18 (GMT)
commitb3d109d0deac59559df22f72622d94b9793d2a79 (patch)
tree0d04c7eba6b471b5100dcfc20f53b4cf8649c6e5 /win
parent8f4c0692e4059e188dd75f711b271b138dce960d (diff)
downloadtk-b3d109d0deac59559df22f72622d94b9793d2a79.zip
tk-b3d109d0deac59559df22f72622d94b9793d2a79.tar.gz
tk-b3d109d0deac59559df22f72622d94b9793d2a79.tar.bz2
Don't add UNIX_DIR to VPATH. This should solve a dependency problem on Cygwin, between the windows and UNIX build part.
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in8
1 files changed, 7 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index fe114cd..43f9c81 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -150,7 +150,7 @@ MAN2TCL = man2tcl$(EXEEXT)
# makefile to look into these paths when resolving .c to .obj
# dependencies.
-VPATH = $(GENERIC_DIR):$(TTK_DIR):$(WIN_DIR):$(UNIX_DIR):$(XLIB_DIR):$(RC_DIR)
+VPATH = $(GENERIC_DIR):$(TTK_DIR):$(WIN_DIR):$(XLIB_DIR):$(RC_DIR)
# warning flags
CFLAGS_WARNING = @CFLAGS_WARNING@
@@ -676,6 +676,12 @@ tkSquare.$(OBJEXT): tkSquare.c
tkMain2.$(OBJEXT): tkMain.c
$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DUNICODE=1 -D_UNICODE=1 @DEPARG@ $(CC_OBJNAME)
+tkUnixMenubu.$(OBJEXT): ${UNIX_DIR}/tkUnixMenubu.c
+ $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
+
+tkUnixScale.$(OBJEXT): ${UNIX_DIR}/tkUnixScale.c
+ $(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
+
# Extra dependency info
tkConsole.$(OBJEXT): configure Makefile
tkMain.$(OBJEXT): configure Makefile