Add hostname-related utilities in glib/ghostutils.h

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 24d3bfe..eb220e6 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -116,6 +116,7 @@ libglib_2_0_la_SOURCES =    \
        gfileutils.c            \
        ghash.c                 \
        ghook.c                 \
+       ghostutils.c            \
        giochannel.c            \
        gkeyfile.c              \
        glibintl.h              \
@@ -129,6 +130,7 @@ libglib_2_0_la_SOURCES =    \
        gnode.c                 \
        goption.c               \
        gpattern.c              \
+       gpoll.c                 \
        gprimes.c               \
        gqsort.c                \
        gqueue.c                \
@@ -164,8 +166,7 @@ libglib_2_0_la_SOURCES =    \
        gutils.c                \
        gdebug.h                \
        gprintf.c               \
-       gprintfint.h            \
-       gi18n.c
+       gprintfint.h
 
 EXTRA_libglib_2_0_la_SOURCES = \
        giounix.c       \
@@ -199,6 +200,7 @@ glibsubinclude_HEADERS =   \
        gfileutils.h    \
        ghash.h         \
        ghook.h         \
+       ghostutils.h    \
        gi18n.h         \
        gi18n-lib.h     \
        giochannel.h    \
@@ -213,6 +215,7 @@ glibsubinclude_HEADERS =   \
        gnode.h         \
        goption.h       \
        gpattern.h      \
+       gpoll.h         \
        gprimes.h       \
        gqsort.h        \
        gquark.h        \
@@ -301,12 +304,26 @@ 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
+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 $@
@@ -317,7 +334,7 @@ if OS_UNIX
 
 INSTALL_PROGS  += gtester
 gtester_SOURCES         = gtester.c
-gtester_LDADD   = libglib-2.0.la
+gtester_LDADD   = libglib-2.0.la 
 
 auto_config_binscripts = gtester-report
 bin_SCRIPTS = ${auto_config_binscripts}
@@ -332,7 +349,7 @@ install-exec-hook:
          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}|' \
+           -e '1,1s|#! /usr/bin/env python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
          || exit $$? ; \
          rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
        done
@@ -340,7 +357,7 @@ install-exec-hook:
 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)'; \