--- embedaddon/confuse/Makefile.am	2017/01/24 14:48:55	1.1.1.1
+++ embedaddon/confuse/Makefile.am	2021/03/17 00:49:17	1.1.1.2
@@ -1,64 +1,101 @@
 ## Process this file with automake to produce Makefile.in
 
-AUTOMAKE_OPTIONS = foreign
-CLEANFILES=*~ '\#*\#'
-EXTRA_DIST=libconfuse.spec.in libconfuse.spec
+ACLOCAL_AMFLAGS  = -I m4
+CLEANFILES       = *~ '\#*\#'
+pkgconfigdir     = $(libdir)/pkgconfig
+pkgconfig_DATA   = libconfuse.pc
+doc_DATA         = README.md AUTHORS LICENSE ChangeLog.md
+EXTRA_DIST       = README.md LICENSE ChangeLog.md libconfuse.spec.in libconfuse.spec
 
-EXAMPLES =
+EXAMPLES         =
 if ENABLE_EXAMPLES
-  EXAMPLES += examples
+  EXAMPLES      += examples
 endif
-SUBDIRS = m4 po src $(EXAMPLES) tests doc
+SUBDIRS          = m4 po src $(EXAMPLES) tests doc
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libconfuse.pc
+## Windows build files, for ZIP archive
+BORLAND_FILES         = cfgtest.bpf cfgtest.bpr config.h confuse.bpg libConfuse.bpf libConfuse.bpr
+DEVCPP_FILES          = cfgtest.dev config.h libConfuse.dev
+MSVC6_FILES           = config.h libConfuse.dsp libConfuse.dsw unistd.h
+MSVS_FILES            = config.h msvs.net.sln unistd.h
+MSVS_CFGTEST_FILES    = cfgtest.vcproj
+MSVS_LIBCONFUSE_FILES = libConfuse.vcproj
+MINGW_FILES           = build.bat config.h Makefile
 
-celan: clean
-
-ACLOCAL_AMFLAGS = -I m4
-
-BORLAND_FILES=cfgtest.bpf cfgtest.bpr config.h confuse.bpg libConfuse.bpf libConfuse.bpr
-DEVCPP_FILES=cfgtest.dev config.h libConfuse.dev
-MSVC6_FILES=config.h libConfuse.dsp libConfuse.dsw unistd.h
-MSVS_FILES=config.h msvs.net.sln unistd.h
-MSVS_CFGTEST_FILES=cfgtest.vcproj
-MSVS_LIBCONFUSE_FILES=libConfuse.vcproj
-
 add-windows-files:
-	mkdir $(distdir)/windows
-	mkdir $(distdir)/windows/borland
-	mkdir $(distdir)/windows/devcpp
-	mkdir $(distdir)/windows/msvc6
-	mkdir $(distdir)/windows/msvc6/libConfuse
-	mkdir $(distdir)/windows/msvs.net
-	mkdir $(distdir)/windows/msvs.net/cfgtest
-	mkdir $(distdir)/windows/msvs.net/libConfuse
-
-	for f in $(BORLAND_FILES); do \
+	@mkdir $(distdir)/windows
+	@mkdir $(distdir)/windows/borland
+	@mkdir $(distdir)/windows/devcpp
+	@mkdir $(distdir)/windows/msvc6
+	@mkdir $(distdir)/windows/msvc6/libConfuse
+	@mkdir $(distdir)/windows/msvs.net
+	@mkdir $(distdir)/windows/msvs.net/cfgtest
+	@mkdir $(distdir)/windows/msvs.net/libConfuse
+	@mkdir $(distdir)/windows/mingw
+	@for f in $(BORLAND_FILES); do \
 		cp -f $(top_srcdir)/windows/borland/$$f $(distdir)/windows/borland/; done
-	for f in $(DEVCPP_FILES); do \
+	@for f in $(DEVCPP_FILES); do \
 		cp -f $(top_srcdir)/windows/devcpp/$$f $(distdir)/windows/devcpp/; done
-	for f in $(MSVS_FILES); do \
+	@for f in $(MSVS_FILES); do \
 		cp -f $(top_srcdir)/windows/msvs.net/$$f $(distdir)/windows/msvs.net/; done
-	for f in $(MSVS_CFGTEST_FILES); do \
+	@for f in $(MSVS_CFGTEST_FILES); do \
 		cp -f $(top_srcdir)/windows/msvs.net/cfgtest/$$f $(distdir)/windows/msvs.net/cfgtest/; done
-	for f in $(MSVS_LIBCONFUSE_FILES); do \
+	@for f in $(MSVS_LIBCONFUSE_FILES); do \
 	   cp -f $(top_srcdir)/windows/msvs.net/libConfuse/$$f $(distdir)/windows/msvs.net/libConfuse; done
-	for f in $(MSVC6_FILES); do \
+	@for f in $(MSVC6_FILES); do \
 	   cp -f $(top_srcdir)/windows/msvc6/libConfuse/$$f $(distdir)/windows/msvc6/libConfuse; done
-	cp $(top_srcdir)/examples/wincfgtest.c $(distdir)/examples
-	cp $(top_srcdir)/examples/wincfgtest.conf $(distdir)/examples
-	cp $(top_srcdir)/examples/wincfgtest.dev $(distdir)/examples
+	@for f in $(MINGW_FILES); do \
+	   cp -f $(top_srcdir)/windows/mingw/$$f $(distdir)/windows/mingw; done
+	@cp $(top_srcdir)/examples/wincfgtest.c $(distdir)/examples
+	@cp $(top_srcdir)/examples/wincfgtest.conf $(distdir)/examples
+	@cp $(top_srcdir)/examples/wincfgtest.dev $(distdir)/examples
 
 unpack:
-	tar zxf $(PACKAGE)-$(VERSION).tar.gz
+	@tar xfz $(distdir).tar.gz
 
 zip: dist unpack add-windows-files
-	rm -f $(PACKAGE)-$(VERSION).zip
-	zip -r $(PACKAGE)-$(VERSION).zip $(PACKAGE)-$(VERSION)
-	rm -rf $(PACKAGE)-$(VERSION)
+	@rm -f $(distdir).zip
+	@zip -qr $(distdir).zip $(distdir)
+	@rm -rf $(distdir)
 
 rpm: Makefile
-	$(MAKE) dist
-	rpmbuild -ta --clean $(PACKAGE)-$(VERSION).tar.gz
+	@$(MAKE) dist
+	@rpmbuild -ta --clean $(distdir).tar.gz
 
+## ZIP files are reserved for the Windows distribution of libConfuse
+dist-zip: zip
+
+## Generate MD5 checksum file
+MD5 = md5sum
+md5-dist:
+	@for file in $(DIST_ARCHIVES) $(distdir).zip; do	\
+		$(MD5) $$file > $$file.md5;			\
+	done
+
+## Check if tagged in git
+release-hook:
+	@if [ ! `git tag | grep v$(PACKAGE_VERSION)` ]; then				\
+		echo;									\
+		printf "\e[1m\e[41mCannot find release tag v$(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[5mDo release anyway?\e[0m "; read yorn;			\
+		if [ "$$yorn" != "y" -a "$$yorn" != "Y" ]; then				\
+			printf "OK, aborting release.\n";				\
+			exit 1;								\
+		fi;									\
+		echo;									\
+	else										\
+		echo;									\
+		printf "\e[1m\e[42mFound GIT release tag v$(PACKAGE_VERSION)\e[0m\n";	\
+		printf "\e[1m\e[44m>>Remember to push tags!\e[0m\n";			\
+		echo;									\
+	fi
+
+## Target to run when building a release
+release: release-hook distcheck dist-zip md5-dist
+	@echo
+	@echo "Resulting release files:"
+	@echo "================================================================="
+	@for file in $(DIST_ARCHIVES) $(distdir).zip; do				\
+		printf "%-32s Distribution tarball\n" $$file;				\
+		printf "%-32s " $$file.md5; cat $$file.md5 | cut -f1 -d' ';		\
+	done