diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-06-24 06:15:43 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-06-24 06:15:43 +0800 |
| commit | dafc2a996545008a9027f2e894ab784b62464c00 (patch) | |
| tree | 01368f0320b43a9a314710a0774afdd997ee70e4 /src/Makefile.am | |
| parent | 8415cf6da16201127aadb7853e3969ed824de919 (diff) | |
| download | gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar.gz gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar.bz2 gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar.lz gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar.xz gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.tar.zst gsoc2013-epiphany-dafc2a996545008a9027f2e894ab784b62464c00.zip | |
Require NetworkManager
It's not optional in GNOME 3
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4b095a8b0..a97aa27e7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -113,9 +113,10 @@ libephymain_la_CPPFLAGS = \ $(AM_CPPFLAGS) libephymain_la_CFLAGS = \ - $(DEPENDENCIES_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(WEBKIT_CFLAGS) \ + $(DEPENDENCIES_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(WEBKIT_CFLAGS) \ + $(NETWORK_MANAGER_CFLAGS) \ $(AM_CFLAGS) BUILT_SOURCES = \ @@ -123,7 +124,6 @@ BUILT_SOURCES = \ ephy-dbus-client-bindings.h \ ephy-dbus-server-bindings.h -if ENABLE_NETWORK_MANAGER nodist_libephymain_la_SOURCES += \ ephy-network-manager.c \ ephy-network-manager.h @@ -139,9 +139,6 @@ ephy-network-manager.c ephy-network-manager.h: $(top_srcdir)/data/ephy-network-m --interface-prefix org.freedesktop. \ $< -libephymain_la_CFLAGS += $(NETWORK_MANAGER_CFLAGS) -endif - if ENABLE_SEED NOINST_H_FILES += \ ephy-seed-extension.h \ @@ -186,6 +183,7 @@ epiphany_LDADD = \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ $(DBUS_LIBS) \ + $(NETWORK_MANAGER_LIBS) \ $(LIBINTL) if HAVE_INTROSPECTION @@ -197,11 +195,6 @@ if ENABLE_SEED epiphany_LDADD += $(SEED_LIBS) endif # ENABLE_SEED -if ENABLE_NETWORK_MANAGER -epiphany_LDADD += \ - $(NETWORK_MANAGER_LIBS) -endif - TYPES_SOURCE = \ ephy-type-builtins.c \ ephy-type-builtins.h |