Skip to content

Commit

Permalink
Update autotools things (e.g. git-based version)
Browse files Browse the repository at this point in the history
  • Loading branch information
ttsiodras committed Oct 30, 2020
1 parent 20448d2 commit bac073b
Show file tree
Hide file tree
Showing 14 changed files with 572 additions and 585 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ autom4te.cache/
src/config.h.in~
src/*.o
src/*.exe
src/version.h
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Thanassis Tsiodras <[email protected]>
Thanassis Tsiodras <[email protected]>
36 changes: 16 additions & 20 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2020 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.

# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
Expand Down Expand Up @@ -93,6 +93,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
$(top_srcdir)/ac-macros/ax_openmp.m4 \
$(top_srcdir)/ac-macros/ax_cflags_gcc_option.m4 \
$(top_srcdir)/ac-macros/revision_utils.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
Expand Down Expand Up @@ -138,7 +139,7 @@ am__recursive_targets = \
$(RECURSIVE_CLEAN_TARGETS) \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
cscope distdir dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
Expand Down Expand Up @@ -237,6 +238,8 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LAST_CONFIG_DATE = @LAST_CONFIG_DATE@
LAST_CONFIG_YEAR = @LAST_CONFIG_YEAR@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
Expand All @@ -253,6 +256,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
SCM_REVISION = @SCM_REVISION@
SDL_CFLAGS = @SDL_CFLAGS@
SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
Expand Down Expand Up @@ -302,6 +306,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
Expand Down Expand Up @@ -341,8 +346,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;

$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
Expand Down Expand Up @@ -460,10 +465,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

distdir: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) distdir-am

distdir-am: $(DISTFILES)
distdir: $(DISTFILES)
$(am__remove_distdir)
test -d "$(distdir)" || mkdir "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
Expand Down Expand Up @@ -528,7 +530,7 @@ distdir-am: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)

dist-bzip2: distdir
Expand All @@ -543,10 +545,6 @@ dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)

dist-zstd: distdir
tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
$(am__post_remove_distdir)

dist-tarZ: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
Expand All @@ -558,7 +556,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)

dist-zip: distdir
Expand All @@ -576,7 +574,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
Expand All @@ -586,11 +584,9 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
Expand Down Expand Up @@ -768,7 +764,7 @@ uninstall-am:
am--refresh check check-am clean clean-cscope clean-generic \
cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
dist-zstd distcheck distclean distclean-generic distclean-tags \
distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COMPILE/INSTALL/RUN
Windows
-------
Windows users can download and run a pre-compiled Windows binary
[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.0/mandelSSE-win32-2.0.zip).
[here](https://github.com/ttsiodras/MandelbrotSSE/releases/download/2.1/mandelSSE-win32-2.1.zip).

After decompressing, you can simply execute either one of the two .bat
files. The 'autopilot' one zooms in a specific location, while the other
Expand Down
59 changes: 59 additions & 0 deletions ac-macros/revision_utils.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Automake macro to set the revision utils

# Usage: AM_REVISION_UTILS([directory_name]).
# Directory name must be a litteral string and not the result of a
# command.

AC_DEFUN([AM_REVISION_UTILS],
[
# Take the current SVN revision
AC_MSG_CHECKING(whether this is a SCM working copy)
temp_scm_output=`(cd $srcdir; git rev-parse --short HEAD)`
if test x"${temp_scm_output}" = x""; then
# This means we are NOT working on a repository copy, the value of
# SCM_REVISION will not be taken into account.
SCM_REVISION=""
AC_MSG_RESULT(no.)
else
SCM_REVISION="r${temp_scm_output}"
AC_MSG_RESULT(yes: ${SCM_REVISION}.)
fi
AC_SUBST(SCM_REVISION)
# Take the configure full date
AC_MSG_CHECKING(the configuration full date)
temp_config_date=`LANG=C date +"%A %d %B %Y, %H:%M:%S"`
if test x"${temp_config_date}" = x""; then
LAST_CONFIG_DATE=""
AC_MSG_RESULT(empty date.)
else
LAST_CONFIG_DATE="${temp_config_date}"
AC_MSG_RESULT(${LAST_CONFIG_DATE}.)
fi
AC_SUBST(LAST_CONFIG_DATE)
# Take the configure year
AC_MSG_CHECKING(the configuration year)
temp_config_year=`LANG=C date +"%Y"`
if test x"${temp_config_year}" = x""; then
LAST_CONFIG_YEAR="2007"
AC_MSG_RESULT(no year found, fall into default: ${LAST_CONFIG_YEAR}.)
else
LAST_CONFIG_YEAR="${temp_config_year}"
AC_MSG_RESULT(${LAST_CONFIG_YEAR})
fi
AC_SUBST(LAST_CONFIG_YEAR)
])
1 change: 1 addition & 0 deletions acinclude.m4
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
m4_include([ac-macros/ax_openmp.m4])
m4_include([ac-macros/ax_cflags_gcc_option.m4])
m4_include([ac-macros/revision_utils.m4])
Loading

0 comments on commit bac073b

Please sign in to comment.