summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2017-09-01 02:22:42 (GMT)
committerdgp <dgp@users.sourceforge.net>2017-09-01 02:22:42 (GMT)
commit67f0b5a99fac8356afb78c9e429bbe6c9d911f0b (patch)
tree237c3e0c4134a51fb9715ed9c0e15cf2550e5f30 /unix
parent8d10e02a9ffeee4273a550b3d1e21d3a4a5e8719 (diff)
parent83a33e47ae22f827311e39064237fb508d36254d (diff)
downloadtk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.zip
tk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.tar.gz
tk-67f0b5a99fac8356afb78c9e429bbe6c9d911f0b.tar.bz2
merge trunk
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1b8677e..db6cc2c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -356,7 +356,7 @@ CANV_OBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvImg.o \
tkCanvUtil.o tkCanvWind.o tkRectOval.o tkTrig.o
IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPNG.o tkImgPPM.o \
- tkImgPhoto.o tkImgPhInstance.o
+ tkImgPhoto.o tkImgPhInstance.o tkImgListFormat.o
TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
tkTextMark.o tkTextTag.o tkTextWind.o
@@ -450,7 +450,7 @@ GENERIC_SRCS = \
$(GENERIC_DIR)/tkImgBmap.c $(GENERIC_DIR)/tkImgGIF.c \
$(GENERIC_DIR)/tkImgPNG.c $(GENERIC_DIR)/tkImgPPM.c \
$(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkImgPhInstance.c \
- $(GENERIC_DIR)/tkText.c \
+ $(GENERIC_DIR)/tkImgListFormat.c $(GENERIC_DIR)/tkText.c \
$(GENERIC_DIR)/tkTextBTree.c $(GENERIC_DIR)/tkTextDisp.c \
$(GENERIC_DIR)/tkTextImage.c \
$(GENERIC_DIR)/tkTextIndex.c $(GENERIC_DIR)/tkTextMark.c \
@@ -1105,6 +1105,9 @@ tkImage.o: $(GENERIC_DIR)/tkImage.c
tkImgBmap.o: $(GENERIC_DIR)/tkImgBmap.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgBmap.c
+tkImgListFormat.o: $(GENERIC_DIR)/tkImgListFormat.c
+ $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgListFormat.c
+
tkImgGIF.o: $(GENERIC_DIR)/tkImgGIF.c
$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgGIF.c