Auto stash before revert of "Delete config.h.in~"

Makefile

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # Makefile.  Generated from Makefile.in by configure.
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -112,7 +112,7 @@ am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
 am__v_at_0 = @
 am__v_at_1 = 
 depcomp =
-am__maybe_remake_depfiles =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -164,7 +164,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)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -231,12 +231,21 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+<<<<<<< HEAD
 ACLOCAL = ${SHELL} /home/matteo/Dropbox/logic-synthesis/missing aclocal-1.16
 AMTAR = $${TAR-tar}
 AM_DEFAULT_VERBOSITY = 1
 AUTOCONF = ${SHELL} /home/matteo/Dropbox/logic-synthesis/missing autoconf
 AUTOHEADER = ${SHELL} /home/matteo/Dropbox/logic-synthesis/missing autoheader
 AUTOMAKE = ${SHELL} /home/matteo/Dropbox/logic-synthesis/missing automake-1.16
+=======
+ACLOCAL = aclocal-1.15
+AMTAR = $${TAR-tar}
+AM_DEFAULT_VERBOSITY = 1
+AUTOCONF = autoconf
+AUTOHEADER = autoheader
+AUTOMAKE = automake-1.15
+>>>>>>> parent of a11981b... Update to automake 1.16 and added PKGBUILD
 AWK = gawk
 CC = gcc
 CFLAGS = -g -O2
@@ -263,7 +272,11 @@ LIBOBJS =
 LIBS = 
 LN_S = ln -s
 LTLIBOBJS = 
+<<<<<<< HEAD
 MAKEINFO = ${SHELL} /home/matteo/Dropbox/logic-synthesis/missing makeinfo
+=======
+MAKEINFO = makeinfo
+>>>>>>> parent of a11981b... Update to automake 1.16 and added PKGBUILD
 MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = sis
@@ -318,6 +331,7 @@ pdfdir = ${docdir}
 prefix = /usr/local
 program_transform_name = s,x,x,
 psdir = ${docdir}
+runstatedir = ${localstatedir}/run
 sbindir = ${exec_prefix}/sbin
 sharedstatedir = ${prefix}/com
 srcdir = .
@@ -353,8 +367,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)
@@ -508,10 +522,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'`; \

Makefile.in

@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -112,7 +112,7 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 depcomp =
-am__maybe_remake_depfiles =
+am__depfiles_maybe =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
@@ -164,7 +164,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)config.h.in
 # Read a list of newline-separated strings from the standard input,
@@ -318,6 +318,7 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -353,8 +354,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)
@@ -508,10 +509,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'`; \

README.md

@@ -1,7 +1,6 @@
 # Legacy Logic Synthesis Software
 
 This repository contains old logic synthesis software, from University of California Berkeley:
-
 - SIS
 - BALM
 - MVSIS
@@ -11,87 +10,70 @@ These are all refactored releases, for making sure they compile on modern system
 > AUR ...
 
 ## SIS
-
 The repo contains SIS 1.4, an unofficial release of SIS, the logic synthesis system from UC Berkeley.
 
 The primary features added on top of SIS 1.3 are:
-
 - Code refactoring for making sure it compiles under modern Linux systems like Ubuntu 18.04
 - Exploring and deleting unused/unuseful parts (like `xsis`)
 - Rewriting the `sis` shell using `GNU readline`
 
 ### Compatibility
 
 I've succesfully tested this release with the following distributions:
-
-- Ubuntu 18.04 / 18.10 / 16.04
-- Arch Linux
+  - Ubuntu 18.04 / 18.10 / 16.04
+  - Arch Linux
 
 Some other platforms should be okay with little or no modifications.
 However, SIS is old software, and may not build or run correctly on modern systems.
 
 ### Compilation and installation
-
 If you're using a supported OS like Debian/Ubuntu, you can use the Debian package you can find
 in the "_releases_" tab.
 There's also an already compiled static binary, with installation and uninstallation scripts.
 
 For compiling SIS, you'll need the following software:
-
 - `GNU gcc` (tested with version 7.3)
 - `GNU make` (tested with version 4.1)
 - `GNU bison` (tested with version 3.0.4)
 - `GNU flex` (tested with version 2.6.4)
 - `GNU readline` (tested with version 7)
-
 If you are using Ubuntu, you can easily install all these dependecies with
-
 ```shell
 sudo apt install -y make gcc bison flex build-essential libreadline-dev
 ```
-
 Then just run these commands:
-
 ```shell
 ./configure --prefix=<target install directory> <other options>
 make
 sudo make install
 ```
 
 ## MVSIS/BALM
-
 The repo also contains MVSIS 3.0 and BALM 2.0, with a small set of patches for allowing compilation
 under modern systems.
 
 ### Compatibility
 
 I've succesfully tested this release with the following distributions:
-
-- Ubuntu 18.04 / 18.10 / 16.04
-- Arch Linux
+  - Ubuntu 18.04 / 18.10 / 16.04
+  - Arch Linux
 
 Some other platforms should be okay with little or no modifications.
 However, since this is old software, and may not build or run correctly on modern systems.
 
 ### Compilation and installation
-
 If you're using a supported OS like Debian/Ubuntu, you can use the Debian package you can find
 in the "_releases_" tab.
 
 For compiling SIS, you'll need the following software:
-
 - `GNU gcc`, with the multilib option (tested with version 7.3)
 - `GNU make` (tested with version 4.1)
 - `GNU readline` (tested with version 7)
-
 If you are using Ubuntu, you can easily install all these dependecies with
-
 ```shell
 sudo apt install build-essential gcc-multilib libreadline-dev
 ```
-
 Then just run these commands:
-
 ```shell
 ./configure --prefix=<target install directory> <other options>
 make