summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-11-24 10:28:08 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-11-24 10:28:08 (GMT)
commit6b9b678f9baccfa26a0f82519ef19ed3284f7bfe (patch)
tree25d69f2a166f3f0d823c68111084f9040fbf0c5c /unix
parent29c94558f50bd1737107636938c46793f41b517b (diff)
downloadtk-6b9b678f9baccfa26a0f82519ef19ed3284f7bfe.zip
tk-6b9b678f9baccfa26a0f82519ef19ed3284f7bfe.tar.gz
tk-6b9b678f9baccfa26a0f82519ef19ed3284f7bfe.tar.bz2
Add generation of "tkUuid.h". Not used yet
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in13
1 files changed, 9 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 010ba48..9414ee7 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1131,7 +1131,7 @@ tkImgPhInstance.o: $(GENERIC_DIR)/tkImgPhInstance.c $(GENERIC_DIR)/tkImgPhoto.h
tkOldTest.o: $(GENERIC_DIR)/tkOldTest.c
$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkOldTest.c
-tkTest.o: $(GENERIC_DIR)/tkTest.c
+tkTest.o: $(GENERIC_DIR)/tkTest.c tkUuid.h
$(CC) -c $(APP_CC_SWITCHES) $(GENERIC_DIR)/tkTest.c
tkText.o: $(GENERIC_DIR)/tkText.c
@@ -1458,6 +1458,11 @@ ttkWidget.o: $(TTK_DIR)/ttkWidget.c
ttkMacOSXTheme.o: $(MAC_OSX_DIR)/ttkMacOSXTheme.c
$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/ttkMacOSXTheme.c
+tkUuid.h: $(TOP_DIR)/manifest.uuid
+ echo "#define TK_VERSION_UUID \\" >$@
+ cat $(TOP_DIR)/manifest.uuid >>$@
+ echo "" >>$@
+
.c.o:
$(CC) -c $(CC_SWITCHES) $<
@@ -1550,10 +1555,10 @@ $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
cd $(MAC_OSX_DIR); autoheader; touch $@
$(TOP_DIR)/manifest.uuid:
- printf "git." >$(TOP_DIR)/manifest.uuid
- git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid
+ printf "git-" >$(TOP_DIR)/manifest.uuid
+ (cd $(TOP_DIR); git rev-parse HEAD >>$(TOP_DIR)/manifest.uuid || printf "unknown" >$(TOP_DIR)/manifest.uuid)
-dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure $(TOP_DIR)/doc/man.macros $(TOP_DIR)/manifest.uuid
rm -rf $(DISTDIR)
mkdir -p $(DISTDIR)/unix
cp -p $(TOP_DIR)/manifest.uuid $(DISTDIR)