Add hostname-related utilities in glib/ghostutils.h
[platform/upstream/glib.git] / glib / Makefile.am
index 22ecd19..eb220e6 100644 (file)
@@ -1,4 +1,5 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
 
 if HAVE_GOOD_PRINTF
 else
@@ -18,12 +19,18 @@ gregex_c =
 gregex_h =
 endif
 
-SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre
+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
 
-DIST_SUBDIRS = libcharset gnulib pcre update-pcre
+DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
 
-INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
-       $(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION 
+AM_CPPFLAGS =                          \
+       -I$(top_srcdir)                 \
+       $(pcre_inc)                     \
+       -DG_LOG_DOMAIN=\"GLib\"         \
+       $(GLIB_DEBUG_FLAGS)             \
+       -DG_DISABLE_DEPRECATED          \
+       -DGLIB_COMPILATION              \
+       -DPCRE_STATIC
 
 glib.def: glib.symbols
        (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/        /' -e 's/G_GNUC_[^ ]*//g') > glib.def
@@ -43,7 +50,7 @@ endif
 
 BUILT_SOURCES = galias.h galiasdef.c
 
-MIRRORING_TAB_SOURCES =                        \
+MIRRORING_TAB_SOURCE =                                 \
        glib-mirroring-tab/Makefile             \
        glib-mirroring-tab/gen-mirroring-tab.c  \
        glib-mirroring-tab/packtab.h            \
@@ -51,7 +58,7 @@ MIRRORING_TAB_SOURCES =                       \
 
 # The compilation of GRegex can be disabled, but the source files must
 # be distributed.
-EXTRA_DIST                   \
+EXTRA_DIST +=                  \
        makefile.msc.in         \
        glib.rc.in              \
        gen-unicode-tables.pl   \
@@ -62,7 +69,8 @@ EXTRA_DIST =                  \
        glib.symbols            \
        gregex.c                \
        gregex.h                \
-       $(MIRRORING_TAB_SOURCES)
+       win_iconv.c             \
+       $(MIRRORING_TAB_SOURCE)
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
@@ -73,18 +81,20 @@ BUILT_EXTRA_DIST =          \
 
 lib_LTLIBRARIES = libglib-2.0.la
 
+if OS_WIN32_AND_DLL_COMPILATION
 if MS_LIB_AVAILABLE
 noinst_DATA = glib-2.0.lib
 
-install-ms-lib:
-       $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
+install_ms_lib_cmd = $(INSTALL) glib-2.0.lib $(DESTDIR)$(libdir)
+uninstall_ms_lib_cmd = -rm $(DESTDIR)$(libdir)/glib-2.0.lib
+endif
+endif
 
-uninstall-ms-lib:
-       -rm $(DESTDIR)$(libdir)/glib-2.0.lib
-else
 install-ms-lib:
+       $(install_ms_lib_cmd)
+
 uninstall-ms-lib:
-endif
+       $(uninstall_ms_lib_cmd)
 
 libglib_2_0_la_SOURCES =       \
        garray.c                \
@@ -95,6 +105,7 @@ libglib_2_0_la_SOURCES =     \
        gbookmarkfile.c         \
        gbsearcharray.h         \
        gcache.c                \
+       gchecksum.c             \
        gcompletion.c           \
        gconvert.c              \
        gdataset.c              \
@@ -105,6 +116,7 @@ libglib_2_0_la_SOURCES =    \
        gfileutils.c            \
        ghash.c                 \
        ghook.c                 \
+       ghostutils.c            \
        giochannel.c            \
        gkeyfile.c              \
        glibintl.h              \
@@ -118,6 +130,7 @@ libglib_2_0_la_SOURCES =    \
        gnode.c                 \
        goption.c               \
        gpattern.c              \
+       gpoll.c                 \
        gprimes.c               \
        gqsort.c                \
        gqueue.c                \
@@ -133,6 +146,7 @@ libglib_2_0_la_SOURCES =    \
        gstdio.c                \
        gstrfuncs.c             \
        gstring.c               \
+       gtestutils.c            \
        gthread.c               \
        gthreadprivate.h        \
        gthreadpool.c           \
@@ -148,6 +162,7 @@ libglib_2_0_la_SOURCES =    \
        gunidecomp.h            \
        gunidecomp.c            \
        gunicodeprivate.h       \
+       gurifuncs.c             \
        gutils.c                \
        gdebug.h                \
        gprintf.c               \
@@ -175,6 +190,7 @@ glibsubinclude_HEADERS =   \
        gbase64.h       \
        gbookmarkfile.h \
        gcache.h        \
+       gchecksum.h     \
        gcompletion.h   \
        gconvert.h      \
        gdataset.h      \
@@ -184,6 +200,7 @@ glibsubinclude_HEADERS =   \
        gfileutils.h    \
        ghash.h         \
        ghook.h         \
+       ghostutils.h    \
        gi18n.h         \
        gi18n-lib.h     \
        giochannel.h    \
@@ -198,6 +215,7 @@ glibsubinclude_HEADERS =   \
        gnode.h         \
        goption.h       \
        gpattern.h      \
+       gpoll.h         \
        gprimes.h       \
        gqsort.h        \
        gquark.h        \
@@ -213,6 +231,7 @@ glibsubinclude_HEADERS =   \
        gspawn.h        \
        gstdio.h        \
        gstrfuncs.h     \
+       gtestutils.h    \
        gstring.h       \
        gthread.h       \
        gthreadpool.h   \
@@ -220,6 +239,7 @@ glibsubinclude_HEADERS =   \
        gtree.h         \
        gtypes.h        \
        gunicode.h      \
+       gurifuncs.h             \
        gutils.h        \
        gwin32.h        \
        gprintf.h
@@ -237,10 +257,14 @@ if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
-if OS_WIN32
-# This requires a very new libtool
+if OS_WIN32_AND_DLL_COMPILATION
 export_symbols = -export-symbols glib.def
 
+glib_win32_res = glib-win32-res.o
+glib_win32_res_ldflag = -Wl,$(glib_win32_res)
+
+glib_def = glib.def
+
 install-def-file:
        $(INSTALL) glib.def $(DESTDIR)$(libdir)/glib-2.0.def
 
@@ -253,44 +277,87 @@ uninstall-def-file:
 export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif
 
-if OS_WIN32
-glib_win32_res = glib-win32-res.o
-glib_win32_res_ldflag = -Wl,$(glib_win32_res)
-endif
-
 if ENABLE_REGEX
 if USE_SYSTEM_PCRE
 pcre_lib = $(PCRE_LIBS)
+pcre_inc = $(PCRE_CFLAGS)
 else
 pcre_lib = pcre/libpcre.la
+pcre_inc =
 endif
 else
 pcre_lib =
+pcre_inc =
 endif
 
 libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib)
-libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) @GLIB_DEF@
+libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
 
 libglib_2_0_la_LDFLAGS = \
         $(glib_win32_res_ldflag) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
        -export-dynamic $(no_undefined) $(export_symbols)
 
+INSTALL_PROGS=
+
+gspawn-win32-helper-console.c:
+       echo '#define HELPER_CONSOLE' >$@
+       echo '#include "gspawn-win32-helper.c"' >>$@
+
+gspawn-win64-helper.c:
+       echo '#include "gspawn-win32-helper.c"' >$@
+
+gspawn-win64-helper-console.c:
+       echo '#define HELPER_CONSOLE' >$@
+       echo '#include "gspawn-win32-helper.c"' >>$@
+
 if OS_WIN32
-bin_PROGRAMS = gspawn-win32-helper gspawn-win32-helper-console
+if OS_WIN32_X64
+INSTALL_PROGS += gspawn-win64-helper gspawn-win64-helper-console
+gspawn_win64_helper_LDADD = libglib-2.0.la
+gspawn_win64_helper_LDFLAGS = -mwindows
+gspawn_win64_helper_console_LDADD = libglib-2.0.la
+else
+INSTALL_PROGS += gspawn-win32-helper gspawn-win32-helper-console
 gspawn_win32_helper_LDADD = libglib-2.0.la
 gspawn_win32_helper_LDFLAGS = -mwindows
 gspawn_win32_helper_console_LDADD = libglib-2.0.la
+endif
+endif
 
 glib-win32-res.o: glib.rc
        $(WINDRES) glib.rc $@
-endif
 
-gspawn-win32-helper-console.c:
-       echo '#include "gspawn-win32-helper.c"' >$@
+bin_PROGRAMS    = ${INSTALL_PROGS}
+
+if OS_UNIX
+
+INSTALL_PROGS  += gtester
+gtester_SOURCES         = gtester.c
+gtester_LDADD   = libglib-2.0.la 
+
+auto_config_binscripts = gtester-report
+bin_SCRIPTS = ${auto_config_binscripts}
+EXTRA_DIST += ${auto_config_binscripts}
+
+CONFIGVARS = \
+        "bindir"       : "${bindir}",          \
+        "glib-version"  : "${GLIB_VERSION}"
+
+install-exec-hook:
+       for sf in ${auto_config_binscripts} ; do \
+         mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
+         && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
+           -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|  ${CONFIGVARS}|' \
+           -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
+         || exit $$? ; \
+         rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
+       done
+
+endif
 
 glib-2.0.lib: libglib-2.0.la glib.def
-       lib -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
+       lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libglib-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:glib.def -out:$@
 
 dist-hook: $(BUILT_EXTRA_DIST)
        files='$(BUILT_EXTRA_DIST)'; \