From a727a4f78ff233b0dc22c6d5cfe7941a9df2c7ca Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 7 Nov 2021 00:57:01 +0100 Subject: [PATCH] libarmbox/libmipsbox: simplify Makefile.am Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e9c25ba2e404d1d53de5ab796952229b3d536052 Author: vanhofen Date: 2021-11-07 (Sun, 07 Nov 2021) Origin message was: ------------------ - libarmbox/libmipsbox: simplify Makefile.am ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/Makefile.am | 14 ++++---------- libgeneric-pc/Makefile.am | 1 + libmipsbox/Makefile.am | 18 +++++------------- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/libarmbox/Makefile.am b/libarmbox/Makefile.am index 1eb199a..0bc7ec6 100644 --- a/libarmbox/Makefile.am +++ b/libarmbox/Makefile.am @@ -1,8 +1,10 @@ noinst_LTLIBRARIES = libarmbox.la -AM_CPPFLAGS = \ +AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS +AM_CPPFLAGS += \ -I$(top_srcdir)/common \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libeplayer3/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing @@ -23,11 +25,3 @@ libarmbox_la_SOURCES = \ record.cpp \ hdmi_cec.cpp \ playback_libeplayer3.cpp - -AM_CPPFLAGS += \ - -I$(top_srcdir)/libeplayer3/include - -AM_LDFLAGS += \ - -lass - -AM_CPPFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS diff --git a/libgeneric-pc/Makefile.am b/libgeneric-pc/Makefile.am index 1c2e2da..0753963 100644 --- a/libgeneric-pc/Makefile.am +++ b/libgeneric-pc/Makefile.am @@ -42,6 +42,7 @@ endif if ENABLE_GSTREAMER libgeneric_la_SOURCES += \ playback_gst.cpp + AM_LDFLAGS += \ -lgstreamer-1.0 \ -lgsttag-1.0 \ diff --git a/libmipsbox/Makefile.am b/libmipsbox/Makefile.am index 53b544d..bc6fde6 100644 --- a/libmipsbox/Makefile.am +++ b/libmipsbox/Makefile.am @@ -1,8 +1,10 @@ noinst_LTLIBRARIES = libmipsbox.la -AM_CPPFLAGS = \ +AM_CPPFLAGS = -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS +AM_CPPFLAGS += \ -I$(top_srcdir)/common \ - -I$(top_srcdir)/include + -I$(top_srcdir)/include \ + -I$(top_srcdir)/libeplayer3/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing @@ -21,15 +23,5 @@ libmipsbox_la_SOURCES = \ audio.cpp \ init.cpp \ record.cpp \ - hdmi_cec.cpp - -libmipsbox_la_SOURCES += \ + hdmi_cec.cpp \ playback_libeplayer3.cpp - -AM_CPPFLAGS += \ - -I$(top_srcdir)/libeplayer3/include - -AM_LDFLAGS += \ - -lass - -AM_CPPFLAGS += -D__STDC_FORMAT_MACROS -D__STDC_CONSTANT_MACROS