projects / platform / upstream / libsoup.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
soup-message-io: use gio streams rather than SoupSocket
[platform/upstream/libsoup.git] / libsoup / Makefile.am
diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am
index de9c9b6..5cfba04 100644 (file)
--- a/libsoup/Makefile.am
+++ b/libsoup/Makefile.am
@@ -1,50 +1,22 @@
 ## Process this file with automake to produce Makefile.in
 
+include $(GLIB_MAKEFILE)
+
 if OS_WIN32
 LIBWS2_32 = -lws2_32
 endif
 
 INCLUDES =                             \
        -DG_LOG_DOMAIN=\"libsoup\"      \
+       -DLOCALEDIR=\"$(localedir)\"    \
        -I$(top_srcdir)                 \
        $(SOUP_DEBUG_FLAGS)             \
        $(SOUP_MAINTAINER_FLAGS)        \
        $(GLIB_CFLAGS)                  \
        $(XML_CFLAGS)                   \
-       $(GCONF_CFLAGS)                 \
-       $(LIBPROXY_CFLAGS)              \
        $(SQLITE_CFLAGS)                \
        $(GNOME_KEYRING_CFLAGS)
 
-MARSHAL_GENERATED = soup-marshal.c soup-marshal.h
-MKENUMS_GENERATED = soup-enum-types.c soup-enum-types.h
-
-soup-marshal.h: soup-marshal.list
-       $(AM_V_GEN) ( $(GLIB_GENMARSHAL) --prefix=soup_marshal $(srcdir)/soup-marshal.list --header > soup-marshal.tmp \
-       && mv soup-marshal.tmp soup-marshal.h ) \
-       || ( rm -f soup-marshal.tmp && exit 1 )
-
-soup-marshal.c: soup-marshal.h
-       $(AM_V_GEN) ( (echo '#include "soup-marshal.h"'; $(GLIB_GENMARSHAL) --prefix=soup_marshal $(srcdir)/soup-marshal.list --body) > soup-marshal.tmp \
-       && mv soup-marshal.tmp soup-marshal.c ) \
-       || ( rm -f soup-marshal.tmp && exit 1 )
-
-soup-enum-types.h: $(soup_headers)
-       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template soup-enum-types.h.tmpl \
-               $(soup_headers) ) > soup-enum-types.h.tmp \
-       && mv soup-enum-types.h.tmp soup-enum-types.h \
-       || rm -f soup-enum-type.h.tmp
-
-soup-enum-types.c: $(libsoupinclude_HEADERS)
-       $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template soup-enum-types.c.tmpl \
-               $(soup_headers) ) > soup-enum-types.c.tmp \
-       && mv soup-enum-types.c.tmp soup-enum-types.c \
-       || rm -f soup-enum-type.c.tmp
-
-BUILT_SOURCES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-
-CLEANFILES = $(MARSHAL_GENERATED) $(MKENUMS_GENERATED)
-
 libsoupincludedir = $(includedir)/libsoup-2.4/libsoup
 
 soup_headers =                 \
@@ -108,7 +80,6 @@ libsoup_2_4_la_LIBADD =                      \
        $(LIBWS2_32)
 
 libsoup_2_4_la_SOURCES =               \
-       $(BUILT_SOURCES)                \
        soup-address.c                  \
        soup-auth.c                     \
        soup-auth-basic.h               \
@@ -124,6 +95,10 @@ libsoup_2_4_la_SOURCES =            \
        soup-auth-manager.c             \
        soup-auth-manager-ntlm.h        \
        soup-auth-manager-ntlm.c        \
+       soup-body-input-stream.h        \
+       soup-body-input-stream.c        \
+       soup-body-output-stream.h       \
+       soup-body-output-stream.c       \
        soup-cache.c                    \
        soup-cache-private.h            \
        soup-connection.h               \
@@ -136,11 +111,17 @@ libsoup_2_4_la_SOURCES =          \
        soup-date.c                     \
        soup-directory-input-stream.h   \
        soup-directory-input-stream.c   \
+       soup-enum-types.h               \
+       soup-enum-types.c               \
+       soup-filter-input-stream.c      \
+       soup-filter-input-stream.h      \
        soup-form.c                     \
        soup-headers.c                  \
        soup-http-input-stream.h        \
        soup-http-input-stream.c        \
        soup-logger.c                   \
+       soup-marshal.h                  \
+       soup-marshal.c                  \
        soup-message.c                  \
        soup-message-body.c             \
        soup-message-client-io.c        \
@@ -152,6 +133,7 @@ libsoup_2_4_la_SOURCES =            \
        soup-message-server-io.c        \
        soup-method.c                   \
        soup-misc.c                     \
+       soup-misc-private.h             \
        soup-multipart.c                \
        soup-password-manager.c         \
        soup-path-map.h                 \
@@ -173,8 +155,6 @@ libsoup_2_4_la_SOURCES =            \
        soup-session-private.h          \
        soup-session-sync.c             \
        soup-socket.c                   \
-       soup-ssl.h                      \
-       soup-ssl.c                      \
        soup-status.c                   \
        soup-uri.c                      \
        soup-value-utils.c              \
@@ -182,6 +162,14 @@ libsoup_2_4_la_SOURCES =           \
 
 if BUILD_LIBSOUP_GNOME
 
+if OS_WIN32
+soup_password_manager_gnome_files =    
+else
+soup_password_manager_gnome_files =    \
+       soup-password-manager-gnome.h   \
+       soup-password-manager-gnome.c
+endif
+
 libsoupgnomeincludedir = $(includedir)/libsoup-gnome-2.4/libsoup
 
 libsoupgnomeinclude_HEADERS =  \
@@ -196,8 +184,6 @@ libsoup_gnome_2_4_la_LDFLAGS = $(libsoup_2_4_la_LDFLAGS)
 libsoup_gnome_2_4_la_LIBADD =          \
        libsoup-2.4.la                  \
        $(GLIB_LIBS)                    \
-       $(GCONF_LIBS)                   \
-       $(LIBPROXY_LIBS)                \
        $(SQLITE_LIBS)                  \
        $(GNOME_KEYRING_LIBS)
 
@@ -206,11 +192,18 @@ libsoup_gnome_2_4_la_SOURCES =            \
        soup-gnome-features.c           \
        soup-proxy-resolver-gnome.h     \
        soup-proxy-resolver-gnome.c     \
-       soup-password-manager-gnome.h   \
-       soup-password-manager-gnome.c
+       $(soup_password_manager_gnome_files)
 
 endif
 
+GLIB_GENERATED = soup-marshal.c soup-marshal.h
+GLIB_GENERATED += soup-enum-types.c soup-enum-types.h
+BUILT_SOURCES = $(GLIB_GENERATED)
+
+soup_marshal_sources = $(libsoup_2_4_la_SOURCES) $(libsoup_gnome_2_4_la_SOURCES)
+soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS)
+soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API"
+
 #
 # Introspection support
 #
@@ -223,7 +216,7 @@ if HAVE_INTROSPECTION
 
 # Core library
 gi_soup_files = \
-       $(filter-out soup.h soup-enum-types.% soup-marshal.%,\
+       $(filter-out soup.h soup-enum-types.% soup-marshal.% soup-proxy-resolver.h,\
           $(soup_headers) $(filter-out %.h, $(libsoup_2_4_la_SOURCES)))
 gi_built_soup_files = soup-enum-types.h
 
@@ -249,10 +242,13 @@ gi_soup_gnome_files = $(filter-out soup-gnome.h,\
                          $(libsoupgnomeinclude_HEADERS) \
                          $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES)))
 SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir
-SoupGNOME_2_4_gir_SCANNERFLAGS = --identifier-prefix=Soup --symbol-prefix=soup --c-include "libsoup/soup-gnome.h"
-SoupGNOME_2_4_gir_INCLUDES = Soup-2.4
+SoupGNOME_2_4_gir_SCANNERFLAGS =                       \
+       --identifier-prefix=Soup                        \
+       --symbol-prefix=soup                            \
+       --c-include "libsoup/soup-gnome.h"              \
+       --include-uninstalled=$(builddir)/Soup-2.4.gir
 SoupGNOME_2_4_gir_CFLAGS = $(INCLUDES)
-SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la
+SoupGNOME_2_4_gir_LIBS = libsoup-gnome-2.4.la libsoup-2.4.la
 SoupGNOME_2_4_gir_FILES = $(addprefix $(srcdir)/,$(gi_soup_gnome_files))
 SoupGNOME_2_4_gir_EXPORT_PACKAGES = libsoup-gnome-2.4
 
@@ -266,11 +262,6 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-CLEANFILES += $(gir_DATA) $(typelib_DATA)
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
 
 endif
-
-EXTRA_DIST=                            \
-       soup-marshal.list               \
-       soup-enum-types.h.tmpl          \
-       soup-enum-types.c.tmpl
Domain: Network & Connectivity / Data Network;