diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-07-10 22:41:47 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-09-05 15:36:34 +0200 |
| commit | 7caf41491ba3b4994530fbe39bfed8cf53f71160 (patch) | |
| tree | cd4885e835c3307ab1f9d6a456cb9d6e05afc8a4 /src/libqmi-glib | |
| parent | dd71f8404b670980372bf0585fc278575d1625b5 (diff) | |
| download | external_libqmi-7caf41491ba3b4994530fbe39bfed8cf53f71160.zip external_libqmi-7caf41491ba3b4994530fbe39bfed8cf53f71160.tar.gz external_libqmi-7caf41491ba3b4994530fbe39bfed8cf53f71160.tar.bz2 | |
build: consolidate the glib requirements
Don't split requirements per product built, but per actual requirement.
Diffstat (limited to 'src/libqmi-glib')
| -rw-r--r-- | src/libqmi-glib/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libqmi-glib/generated/Makefile.am | 4 | ||||
| -rw-r--r-- | src/libqmi-glib/test/Makefile.am | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/libqmi-glib/Makefile.am b/src/libqmi-glib/Makefile.am index bb958a1..b97c573 100644 --- a/src/libqmi-glib/Makefile.am +++ b/src/libqmi-glib/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = generated . test lib_LTLIBRARIES = libqmi-glib.la libqmi_glib_la_CPPFLAGS = \ - $(LIBQMI_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/src/libqmi-glib \ @@ -34,7 +34,7 @@ libqmi_glib_la_SOURCES = \ libqmi_glib_la_LIBADD = \ ${top_builddir}/src/libqmi-glib/generated/libqmi-glib-generated.la \ - $(LIBQMI_GLIB_LIBS) + $(GLIB_LIBS) libqmi_glib_la_LDFLAGS = \ -version-info $(QMI_GLIB_LT_CURRENT):$(QMI_GLIB_LT_REVISION):$(QMI_GLIB_LT_AGE) diff --git a/src/libqmi-glib/generated/Makefile.am b/src/libqmi-glib/generated/Makefile.am index 6701bf9..72a2dab 100644 --- a/src/libqmi-glib/generated/Makefile.am +++ b/src/libqmi-glib/generated/Makefile.am @@ -215,7 +215,7 @@ nodist_libqmi_glib_generated_la_SOURCES = \ $(GENERATED_C) libqmi_glib_generated_la_CPPFLAGS = \ - $(LIBQMI_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/libqmi-glib \ -I$(top_builddir)/src/libqmi-glib \ @@ -224,7 +224,7 @@ libqmi_glib_generated_la_CPPFLAGS = \ -Wno-unused-function libqmi_glib_generated_la_LIBADD = \ - $(LIBQMI_GLIB_LIBS) + $(GLIB_LIBS) includedir = @includedir@/libqmi-glib nodist_include_HEADERS = \ diff --git a/src/libqmi-glib/test/Makefile.am b/src/libqmi-glib/test/Makefile.am index 4d48e4d..6563986 100644 --- a/src/libqmi-glib/test/Makefile.am +++ b/src/libqmi-glib/test/Makefile.am @@ -10,7 +10,7 @@ TEST_PROGS += $(noinst_PROGRAMS) test_utils_SOURCES = \ test-utils.c test_utils_CPPFLAGS = \ - $(LIBQMI_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/libqmi-glib \ -I$(top_srcdir)/src/libqmi-glib/generated \ @@ -19,12 +19,12 @@ test_utils_CPPFLAGS = \ -DLIBQMI_GLIB_COMPILATION test_utils_LDADD = \ $(top_builddir)/src/libqmi-glib/libqmi-glib.la \ - $(LIBQMI_GLIB_LIBS) + $(GLIB_LIBS) test_message_SOURCES = \ test-message.c test_message_CPPFLAGS = \ - $(LIBQMI_GLIB_CFLAGS) \ + $(GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/src/libqmi-glib \ -I$(top_srcdir)/src/libqmi-glib/generated \ @@ -33,4 +33,4 @@ test_message_CPPFLAGS = \ -DLIBQMI_GLIB_COMPILATION test_message_LDADD = \ $(top_builddir)/src/libqmi-glib/libqmi-glib.la \ - $(LIBQMI_GLIB_LIBS) + $(GLIB_LIBS) |