[epiphany] build: Stop using AM_CFLAGS/AM_LDFLAGS
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] build: Stop using AM_CFLAGS/AM_LDFLAGS
- Date: Mon, 29 Aug 2016 18:43:47 +0000 (UTC)
commit 66ca2c4e1410eddb363ca7256936bcdb63c777d7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Mon Aug 29 13:09:28 2016 -0500
build: Stop using AM_CFLAGS/AM_LDFLAGS
Let's be explicit and shorten our automake files by two lines
embed/Makefile.am | 10 +++-------
embed/web-extension/Makefile.am | 10 +++-------
lib/Makefile.am | 14 +++++---------
lib/history/Makefile.am | 10 +++-------
lib/widgets/Makefile.am | 26 +++++++++++---------------
src/Makefile.am | 24 +++++++++---------------
src/bookmarks/Makefile.am | 10 +++-------
7 files changed, 37 insertions(+), 67 deletions(-)
---
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 67504e7..6d4e6f6 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -1,8 +1,5 @@
SUBDIRS = web-extension
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
noinst_LTLIBRARIES = \
libephyembed.la
@@ -59,7 +56,7 @@ libephyembed_la_CFLAGS = \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephyembed_la_CPPFLAGS = \
-I$(top_builddir)/lib \
@@ -70,11 +67,10 @@ libephyembed_la_CPPFLAGS = \
-I$(top_srcdir)/lib/history \
-I$(top_srcdir)/lib/widgets \
-DPKGDATADIR=\"$(pkgdatadir)\" \
- -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\" \
- $(AM_CPPFLAGS)
+ -DEPHY_WEB_EXTENSIONS_DIR=\"$(pkglibdir)/web-extensions\"
libephyembed_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
libephyembed_la_LIBADD = \
$(GDK_LIBS) \
diff --git a/embed/web-extension/Makefile.am b/embed/web-extension/Makefile.am
index 176fd97..ec4940e 100644
--- a/embed/web-extension/Makefile.am
+++ b/embed/web-extension/Makefile.am
@@ -1,6 +1,3 @@
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
webextension_LTLIBRARIES = libephywebextension.la
webextensiondir = $(pkglibdir)/web-extensions
@@ -22,8 +19,7 @@ libephywebextension_la_SOURCES = \
ephy-web-overview-model.c
libephywebextension_la_CPPFLAGS = \
- -I$(top_srcdir)/lib \
- $(AM_CPPFLAGS)
+ -I$(top_srcdir)/lib
libephywebextension_la_CFLAGS = \
$(GIO_CFLAGS) \
@@ -32,10 +28,10 @@ libephywebextension_la_CFLAGS = \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(WEBKIT2GTK_WEB_EXTENSION_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephywebextension_la_LDFLAGS = \
- $(AM_LDFLAGS) -module -avoid-version -no-undefined
+ $(WARN_LDFLAGS) -module -avoid-version -no-undefined
libephywebextension_la_LIBADD = \
$(top_builddir)/lib/libephymisc.la \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1840f4f..7153cc6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,8 +1,5 @@
SUBDIRS = widgets egg history
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
pkglib_LTLIBRARIES = libephymisc.la
TYPES_H_FILES = \
@@ -91,10 +88,10 @@ libephymisc_la_CFLAGS = \
$(LIBXML_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephymisc_la_LDFLAGS = \
- $(AM_LDFLAGS) -avoid-version -no-undefined
+ $(WARN_LDFLAGS) -avoid-version -no-undefined
libephymisc_la_LIBADD = \
$(top_builddir)/lib/history/libephyhistory.la \
@@ -123,14 +120,13 @@ ephy_profile_migrator_CFLAGS = \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
ephy_profile_migrator_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(srcdir)/history \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
- -DLOCALEDIR=\"$(localedir)\" \
- $(AM_CPPFLAGS)
+ -DLOCALEDIR=\"$(localedir)\"
ephy_profile_migrator_LDADD = \
libephymisc.la \
@@ -141,7 +137,7 @@ ephy_profile_migrator_LDADD = \
$(WEBKIT2GTK_LIBS)
ephy_profile_migrator_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
BUILT_SOURCES = \
ephy-lib-type-builtins.c \
diff --git a/lib/history/Makefile.am b/lib/history/Makefile.am
index e108cd0..f69e659 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -1,6 +1,3 @@
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
noinst_LTLIBRARIES = libephyhistory.la
libephyhistory_la_SOURCES = \
@@ -19,16 +16,15 @@ nodist_libephyhistory_la_SOURCES = \
libephyhistory_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephyhistory_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_builddir)/lib/history \
- -I$(top_srcdir)/lib \
- $(AM_CPPFLAGS)
+ -I$(top_srcdir)/lib
libephyhistory_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
libephyhistory_la_LIBADD = \
$(GLIB_LIBS) \
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index ad76ed0..4a008b7 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -1,8 +1,5 @@
noinst_LTLIBRARIES = libephywidgets.la
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
BUILT_SOURCES = \
ephy-widgets-type-builtins.c \
ephy-widgets-type-builtins.h
@@ -86,16 +83,6 @@ libephywidgets_la_SOURCES = \
nautilus-floating-bar.c \
nautilus-floating-bar.h
-libephywidgets_la_CPPFLAGS = \
- -I$(top_builddir)/lib \
- -I$(top_builddir)/lib/widgets \
- -I$(top_srcdir)/embed \
- -I$(top_srcdir)/lib \
- -I$(top_srcdir)/lib/egg \
- -I$(top_srcdir)/lib/history \
- -I$(top_srcdir)/libgd \
- $(AM_CPPFLAGS)
-
libephywidgets_la_CFLAGS = \
$(GCR_CFLAGS) \
$(GDK_CFLAGS) \
@@ -105,10 +92,19 @@ libephywidgets_la_CFLAGS = \
$(GTK_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
+
+libephywidgets_la_CPPFLAGS = \
+ -I$(top_builddir)/lib \
+ -I$(top_builddir)/lib/widgets \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/lib/egg \
+ -I$(top_srcdir)/lib/history \
+ -I$(top_srcdir)/libgd
libephywidgets_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
libephywidgets_la_LIBADD = \
$(top_builddir)/libgd/libgd.la \
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f69167..3eb19fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,5 @@
SUBDIRS = bookmarks
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
pkglib_LTLIBRARIES = libephymain.la
bin_PROGRAMS = epiphany
@@ -78,8 +75,7 @@ libephymain_la_CPPFLAGS = \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
-DLOCALEDIR=\"$(localedir)\" \
- -DPKGDATADIR=\"$(pkgdatadir)\" \
- $(AM_CPPFLAGS)
+ -DPKGDATADIR=\"$(pkgdatadir)\"
libephymain_la_CFLAGS = \
$(GDK_CFLAGS) \
@@ -91,10 +87,10 @@ libephymain_la_CFLAGS = \
$(LIBSOUP_CFLAGS) \
$(LIBXML_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephymain_la_LDFLAGS = \
- $(AM_LDFLAGS) -avoid-version -no-undefined
+ $(WARN_LDFLAGS) -avoid-version -no-undefined
libephymain_la_LIBADD = \
$(top_builddir)/src/bookmarks/libephybookmarks.la \
@@ -154,7 +150,7 @@ epiphany_SOURCES = ephy-main.c \
epiphany_CFLAGS = \
$(libephymain_la_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
epiphany_CPPFLAGS = \
-I$(top_builddir)/lib \
@@ -166,8 +162,7 @@ epiphany_CPPFLAGS = \
-I$(top_builddir)/lib/widgets \
-I$(top_srcdir)/src/bookmarks \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
- -DLOCALEDIR=\"$(localedir)\" \
- $(AM_CPPFLAGS)
+ -DLOCALEDIR=\"$(localedir)\"
epiphany_LDADD = \
libephymain.la \
@@ -179,7 +174,7 @@ epiphany_LDADD = \
epiphany_LDFLAGS = \
-dlopen self \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
libexec_PROGRAMS = epiphany-search-provider
@@ -190,7 +185,7 @@ epiphany_search_provider_SOURCES = \
epiphany_search_provider_CFLAGS = \
$(libephymain_la_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
epiphany_search_provider_CPPFLAGS = \
-I$(top_builddir)/lib \
@@ -199,8 +194,7 @@ epiphany_search_provider_CPPFLAGS = \
-I$(top_srcdir)/lib/history \
-I$(top_srcdir)/src/bookmarks \
-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
- -DLOCALEDIR=\"$(localedir)\" \
- $(AM_CPPFLAGS)
+ -DLOCALEDIR=\"$(localedir)\"
epiphany_search_provider_LDADD = \
libephymain.la \
@@ -213,7 +207,7 @@ epiphany_search_provider_LDADD = \
epiphany_search_provider_LDFLAGS = \
-dlopen self \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
TYPES_SOURCE = \
ephy-type-builtins.c \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 5988a18..90899f9 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -1,8 +1,5 @@
noinst_LTLIBRARIES = libephybookmarks.la
-AM_CFLAGS = $(WARN_CFLAGS)
-AM_LDFLAGS = $(WARN_LDFLAGS)
-
TYPES_H_FILES = \
ephy-bookmarks.h
@@ -104,7 +101,7 @@ libephybookmarks_la_CFLAGS = \
$(LIBXML_CFLAGS) \
$(LIBXSLT_CFLAGS) \
$(WEBKIT2GTK_CFLAGS) \
- $(AM_CFLAGS)
+ $(WARN_CFLAGS)
libephybookmarks_la_CPPFLAGS = \
-I$(top_builddir)/lib \
@@ -115,11 +112,10 @@ libephybookmarks_la_CPPFLAGS = \
-I$(top_srcdir)/lib/widgets \
-I$(top_srcdir)/lib/history \
-I$(top_srcdir)/lib/egg \
- -DPKGDATADIR=\"$(pkgdatadir)\" \
- $(AM_CPPFLAGS)
+ -DPKGDATADIR=\"$(pkgdatadir)\"
libephybookmarks_la_LDFLAGS = \
- $(AM_LDFLAGS)
+ $(WARN_LDFLAGS)
libephybookmarks_la_LIBADD = \
$(AVAHI_CLIENT_LIBS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]