diff options
| -rw-r--r-- | unix/Makefile.in | 13 | ||||
| -rw-r--r-- | win/Makefile.in | 9 | ||||
| -rwxr-xr-x | win/tkUuid.h.in | 1 |
3 files changed, 19 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) diff --git a/win/Makefile.in b/win/Makefile.in index a60961e..68e66d9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -625,6 +625,15 @@ $(TKTEST): testMain.$(OBJEXT) $(TEST_DLL_FILE) @LIBRARIES@ $(TK_STUB_LIB_FILE) w ${TEST_DLL_FILE}: ${TKTEST_OBJS} ${TK_STUB_LIB_FILE} @MAKE_DLL@ ${TKTEST_OBJS} $(TK_STUB_LIB_FILE) $(SHLIB_LD_LIBS) +$(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) + +tkUuid.h: $(TOP_DIR)/manifest.uuid + echo "#define TK_VERSION_UUID \\" >$@ + cat $(TOP_DIR)/manifest.uuid >>$@ + echo "" >>$@ + # Msys make requires this next rule for some reason. $(TCL_SRC_DIR)/win/cat.c: diff --git a/win/tkUuid.h.in b/win/tkUuid.h.in new file mode 100755 index 0000000..5a70a8f --- /dev/null +++ b/win/tkUuid.h.in @@ -0,0 +1 @@ +#define TK_VERSION_UUID \ |