X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=Makefile.am;h=97e5228517357d15a959015d11cb27ff9f98c1b0;hp=1a1074e25938e0c5941fca9ddb64c4b32874a09f;hb=HEAD;hpb=be93391b62b1575ad75db99bf25fef245b85f8b7

diff --git a/Makefile.am b/Makefile.am
index 1a1074e..32c6dd6 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,12 +22,11 @@ AM_LIBTOOLFLAGS = --silent
 GNUMAKEFLAGS = --no-print-directory
 
 DECODERS_DIR = $(pkgdatadir)/decoders
-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)"'
+AM_CPPFLAGS = -DDECODERS_DIR='"$(DECODERS_DIR)"'
 endif
 
 # The tests CFLAGS are a superset of the libsigrokdecode CFLAGS.
@@ -46,7 +44,6 @@ libsigrokdecode_la_SOURCES = \
 	exception.c \
 	module_sigrokdecode.c \
 	type_decoder.c \
-	type_logic.c \
 	error.c \
 	version.c
 
@@ -57,6 +54,21 @@ 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_CFLAGS = $(LIBIRMP_CFLAGS)
+libirmp_la_LIBADD = $(LIBIRMP_LIBS)
+libirmp_la_LDFLAGS = -no-undefined -version-info 0:0:0
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libsigrokdecode.pc
 
@@ -89,20 +101,14 @@ 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-common install-decoders
+install-data-hook: install-decoders