X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=9e15c300395c861c95e246be25672f6771135ef8;hb=239e15df5015e7ea1282cab404e5a63db08f988d;hp=2bbdb2c9d7107894fb94e004ef7d97fcdc966346;hpb=9576e005e18b2d0131e0fce5279a401cbe71c0f8;p=libsigrokdecode.git

diff --git a/Makefile.am b/Makefile.am
index 2bbdb2c..9e15c30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,7 @@
 ## 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
@@ -23,7 +22,12 @@ AM_LIBTOOLFLAGS = --silent
 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
 
@@ -51,6 +54,19 @@ pkginclude_HEADERS = libsigrokdecode.h
 nodist_pkginclude_HEADERS = version.h
 noinst_HEADERS = libsigrokdecode-internal.h
 
+if WITH_IRMP
+lib_LTLIBRARIES += libirmp.la
+libirmp_la_SOURCES = \
+	irmp/irmp-main-sharedlib.c \
+	irmp/irmp-main-sharedlib.h \
+	irmp/irmp.h \
+	irmp/irmpconfig.h \
+	irmp/irmpsystem.h \
+	irmp/irmpprotocols.h
+noinst_HEADERS += irmp/irmp.c
+libirmp_la_LDFLAGS = -no-undefined -version-info 0:0:0
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
@@ -70,7 +86,7 @@ tests_main_SOURCES = \
 	tests/inst.c \
 	tests/session.c
 
-tests_main_CPPFLAGS = -D_POSIX_C_SOURCE=200112L -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 +94,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