Unref GIOChannel in g_at_chat_new_from_tty

[framework/connectivity/connman.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d811c84..0e13bf5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,11 +22,6 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/object.c gdbus/watch.c
 
-gatchat_sources = gatchat/gatchat.h gatchat/gatchat.c \
-                               gatchat/gatresult.h gatchat/gatresult.c \
-                               gatchat/gatsyntax.h gatchat/gatsyntax.c \
-                               gatchat/ringbuffer.h gatchat/ringbuffer.c
-
 if DATAFILES
 dbusdir = @DBUS_DATADIR@
 
@@ -46,7 +41,7 @@ noinst_PROGRAMS =
 
 sbin_PROGRAMS = src/connmand
 
-src_connmand_SOURCES = $(gdbus_sources) $(gatchat_sources) $(builtin_sources) \
+src_connmand_SOURCES = $(gdbus_sources) $(builtin_sources) \
                        src/main.c src/connman.h src/log.c src/selftest.c \
                        src/error.c src/plugin.c src/task.c src/element.c \
                        src/device.c src/network.c src/connection.c \
@@ -74,22 +69,29 @@ CLEANFILES = src/connman.ver src/connman.exp src/connman.conf \
 
 statedir = $(localstatedir)/run/connman
 
-storagedir = $(localstatedir)/lib/connman
-
 plugindir = $(libdir)/connman/plugins
 
 scriptdir = $(libdir)/connman/scripts
 
+storagedir = $(localstatedir)/lib/connman
+
+if MAINTAINER_MODE
+build_plugindir = $(abs_top_srcdir)/plugins/.libs
+build_scriptdir = $(abs_top_srcdir)/scripts
+else
+build_plugindir = $(plugindir)
+build_scriptdir = $(scriptdir)
+endif
+
 AM_CFLAGS = @UDEV_CFLAGS@ @NETLINK_CFLAGS@ @DBUS_CFLAGS@ \
-                       @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ $(builtin_cflags) \
-                                       -DCONNMAN_PLUGIN_BUILTIN \
-                                       -DSTATEDIR=\""$(statedir)"\" \
-                                       -DPLUGINDIR=\""$(plugindir)"\" \
-                                       -DSCRIPTDIR=\""$(scriptdir)"\" \
-                                       -DSTORAGEDIR=\""$(storagedir)\""
+               @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ $(builtin_cflags) \
+                               -DCONNMAN_PLUGIN_BUILTIN \
+                               -DSTATEDIR=\""$(statedir)"\" \
+                               -DPLUGINDIR=\""$(build_plugindir)"\" \
+                               -DSCRIPTDIR=\""$(build_scriptdir)"\" \
+                               -DSTORAGEDIR=\""$(storagedir)\""
 
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/src \
-                               -I$(srcdir)/gdbus -I$(srcdir)/gatchat
+INCLUDES = -I$(builddir)/include -I$(builddir)/src -I$(srcdir)/gdbus
 
 EXTRA_DIST = src/genbuiltin src/connman-dbus.conf src/connman-polkit.conf
 
@@ -167,11 +169,12 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
        $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
 
 src/connman.exp: $(src_connmand_OBJECTS)
-       $(AM_V_GEN)nm -B $^ | awk '{ print $$3 }' | sort -u | grep -E -e '^connman_' > $@
+       $(AM_V_GEN)$(NM) $^ | $(AWK) '{ print $$3 }' | sort -u | \
+                               $(EGREP) -e '^connman_' -e '^g_dbus_' > $@
 
 src/connman.ver: src/connman.exp
        $(AM_V_at)echo "{ global:" > $@
-       $(AM_V_GEN)cat $< | sed -e "s/\(.*\)/\1;/" >> $@
+       $(AM_V_GEN)$(SED) -e "s/\(.*\)/\1;/" $< >> $@
        $(AM_V_at)echo "local: *; };" >> $@
 
 src/connman.conf: src/connman-dbus.conf src/connman-polkit.conf
@@ -184,12 +187,12 @@ endif
 $(src_connmand_OBJECTS) $(plugin_objects): $(local_headers)
 
 include/connman/version.h: include/version.h
-       $(AM_V_at)if [ ! -e include/connman ] ; then mkdir include/connman ; fi
+       $(AM_V_at)$(MKDIR_P) include/connman
        $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
 
 include/connman/%.h: include/%.h
-       $(AM_V_at)if [ ! -e include/connman ] ; then mkdir include/connman ; fi
+       $(AM_V_at)$(MKDIR_P) include/connman
        $(AM_V_GEN)$(LN_S) $(abs_top_srcdir)/$< $@
 
 clean-local: include/connman
-       @rm -r $<
+       @$(RM) -r $<