X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=1a1074e25938e0c5941fca9ddb64c4b32874a09f;hb=366580f2617432561b0a93bc32e56f83895a7e48;hp=02f76d9e63fd77aad5f3d5006ba016aa9da0c5da;hpb=c6bfbc0043089e006c684bcce609da50aadded81;p=libsigrokdecode.git

diff --git a/Makefile.am b/Makefile.am
index 02f76d9..1a1074e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,13 @@ AM_LIBTOOLFLAGS = --silent
 GNUMAKEFLAGS = --no-print-directory
 
 DECODERS_DIR = $(pkgdatadir)/decoders
-AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
+COMMON_DIR = $(pkgdatadir)/common
+# Do not hard-code the decoders location on Windows.
+if WIN32
+AM_CPPFLAGS =
+else
+AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"' -DCOMMON_DIR='"$(COMMON_DIR)"'
+endif
 
 # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS.
 AM_CFLAGS = $(SRD_EXTRA_CFLAGS) $(SRD_WFLAGS) $(TESTS_CFLAGS)
@@ -70,7 +76,7 @@ tests_main_SOURCES = \
 	tests/inst.c \
 	tests/session.c
 
-tests_main_CPPFLAGS = -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
@@ -83,14 +89,20 @@ ChangeLog:
 dist-hook: ChangeLog
 	$(MKDIR_P) $(distdir)/tools
 	cp ${top_srcdir}/tools/install-decoders $(distdir)/tools
+	$(MKDIR_P) $(distdir)/common
+	cp -a ${top_srcdir}/common $(distdir)
 	$(MKDIR_P) $(distdir)/decoders
 	${top_srcdir}/tools/install-decoders -i ${top_srcdir}/decoders \
 		-o $(distdir)/decoders
 
+install-common:
+	$(MKDIR_P) $(DESTDIR)$(COMMON_DIR)
+	cp -a ${top_srcdir}/common $(DESTDIR)$(pkgdatadir)
+
 install-decoders:
 	$(MKDIR_P) $(DESTDIR)$(DECODERS_DIR)
 	$(PYTHON3) ${top_srcdir}/tools/install-decoders \
 		-i ${top_srcdir}/decoders -o $(DESTDIR)$(DECODERS_DIR)
 
-install-data-hook: install-decoders
+install-data-hook: install-common install-decoders