diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-08-28 13:57:01 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-08-28 13:57:01 (GMT) |
| commit | 5e690a71b5a1b19c7d50cd22695ba6a25be4d32a (patch) | |
| tree | 5873103f9976efd351efed322a531929d62cce47 /unix | |
| parent | 082e51738c83c69c7977ff1b3b1481dcc160f94a (diff) | |
| parent | d3a2a48d8d9a19d934337117c18de3084225b7eb (diff) | |
| download | tk-5e690a71b5a1b19c7d50cd22695ba6a25be4d32a.zip tk-5e690a71b5a1b19c7d50cd22695ba6a25be4d32a.tar.gz tk-5e690a71b5a1b19c7d50cd22695ba6a25be4d32a.tar.bz2 | |
Merge tip-166 branch after positive vote by the TCT. Many thanks to Simon Bachmann.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 |
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 |