cfp: Drop unneeded annotation prefix; plural fixes.

[libsigrokdecode.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 465a28d1d1d4f9031c0a74739bdb8ff515972517..97e5228517357d15a959015d11cb27ff9f98c1b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,16 +14,20 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 ACLOCAL_AMFLAGS = -I m4
 AM_LIBTOOLFLAGS = --silent
-MAKEFLAGS = --no-print-directory
+GNUMAKEFLAGS = --no-print-directory
 
 DECODERS_DIR = $(pkgdatadir)/decoders
-AM_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -DDECODERS_DIR='"$(DECODERS_DIR)"'
+# Do not hard-code the decoders location on Windows.
+if WIN32
+AM_CPPFLAGS =
+else
+AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
+endif
 
 # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS.
 AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS)
@@ -40,7 +44,6 @@ libsigrokdecode_la_SOURCES = \
        exception.c \
        module_sigrokdecode.c \
        type_decoder.c \
-       type_logic.c \
        error.c \
        version.c
 
@@ -70,7 +73,7 @@ tests_main_SOURCES = \
        tests/inst.c \
        tests/session.c
 
-tests_main_CPPFLAGS = -D_DEFAULT_SOURCE -DDECODERS_DIR='"$(abs_top_srcdir)/decoders"'
+tests_main_CPPFLAGS = -DDECODERS_TESTDIR='"$(abs_top_srcdir)/decoders"'
 tests_main_LDADD = libsigrokdecode.la $(SRD_EXTRA_LIBS) $(TESTS_LIBS)
 
 MAINTAINERCLEANFILES = ChangeLog
@@ -78,7 +81,7 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog install-decoders
 
 ChangeLog:
-       git --git-dir $(top_srcdir)/.git log > ChangeLog || touch ChangeLog
+       git --git-dir '$(top_srcdir)/.git' log >$@ || touch $@
 
 dist-hook: ChangeLog
        $(MKDIR_P) $(distdir)/tools