GSimpleProxyResolver: new simple GProxyResolver class

[platform/upstream/glib.git] / gio / Makefile.am

diff --git a/gio/Makefile.am b/gio/Makefile.am
index cee9beb..06c71b9 100644 (file)
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -403,6 +403,9 @@ libgio_2_0_la_SOURCES =             \
        gpollableutils.c        \
        gpollfilemonitor.c      \
        gpollfilemonitor.h      \
+       gproxy.c                \
+       gproxyaddress.c         \
+       gproxyaddressenumerator.c \
        gproxyresolver.c        \
        gresolver.c             \
        gresource.c             \
@@ -423,11 +426,9 @@ libgio_2_0_la_SOURCES =            \
        gsocketlistener.c       \
        gsocketoutputstream.c   \
        gsocketoutputstream.h   \
-       gproxy.c                \
-       gproxyaddress.c         \
-       gproxyaddressenumerator.c \
        gsocketservice.c        \
        gsrvtarget.c            \
+       gsimpleproxyresolver.c  \
        gtask.c                 \
        gtcpconnection.c        \
        gtcpwrapperconnection.c \
@@ -586,6 +587,7 @@ gio_headers =                       \
        gsocketlistener.h       \
        gsocketservice.h        \
        gsrvtarget.h            \
+       gsimpleproxyresolver.h  \
        gtask.h                 \
        gtcpconnection.h        \
        gtcpwrapperconnection.h \
@@ -653,13 +655,11 @@ DISTCLEANFILES =          \
 all-local: gio-public-headers.txt
 
 gioenumtypes.h: $(gio_headers) gioenumtypes.h.template
-       $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
-         cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.h.template $(gio_headers) ) > \
+       $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
            gioenumtypes.h.tmp && mv gioenumtypes.h.tmp gioenumtypes.h
 
 gioenumtypes.c: $(gio_headers) gioenumtypes.c.template
-       $(AM_V_GEN) ( top_builddir=`cd $(top_builddir) && pwd`; \
-         cd $(srcdir) && $$top_builddir/gobject/glib-mkenums --template gioenumtypes.c.template $(gio_headers) ) > \
+       $(AM_V_GEN) $(top_builddir)/gobject/glib-mkenums --template $(filter %.template,$^) $(filter-out %.template,$^) > \
            gioenumtypes.c.tmp && mv gioenumtypes.c.tmp gioenumtypes.c
 
 gio-2.0.lib: libgio-2.0.la gio.def