merge GVariantType

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index fbdf900..d285ffd 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -19,6 +19,12 @@ gregex_c =
 gregex_h =
 endif
 
+if HAVE_GCC_BUILTINS_FOR_ATOMIC_OPERATIONS
+gatomic_c = gatomic-gcc.c
+else
+gatomic_c = gatomic.c
+endif
+
 SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
 
 DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests
@@ -70,6 +76,7 @@ EXTRA_DIST +=                         \
        gregex.c                \
        gregex.h                \
        win_iconv.c             \
+       libglib-gdb.py.in       \
        $(MIRRORING_TAB_SOURCE)
 
 # These may be in the builddir too
@@ -99,7 +106,7 @@ uninstall-ms-lib:
 libglib_2_0_la_SOURCES =       \
        garray.c                \
        gasyncqueue.c           \
-       gatomic.c               \
+       $(gatomic_c)            \
        gbacktrace.c            \
        gbase64.c               \
        gbookmarkfile.c         \
@@ -116,6 +123,7 @@ libglib_2_0_la_SOURCES =    \
        gfileutils.c            \
        ghash.c                 \
        ghook.c                 \
+       ghostutils.c            \
        giochannel.c            \
        gkeyfile.c              \
        glibintl.h              \
@@ -129,6 +137,7 @@ libglib_2_0_la_SOURCES =    \
        gnode.c                 \
        goption.c               \
        gpattern.c              \
+       gpoll.c                 \
        gprimes.c               \
        gqsort.c                \
        gqueue.c                \
@@ -162,6 +171,7 @@ libglib_2_0_la_SOURCES =    \
        gunicodeprivate.h       \
        gurifuncs.c             \
        gutils.c                \
+       gvarianttype.c          \
        gdebug.h                \
        gprintf.c               \
        gprintfint.h
@@ -198,6 +208,7 @@ glibsubinclude_HEADERS =   \
        gfileutils.h    \
        ghash.h         \
        ghook.h         \
+       ghostutils.h    \
        gi18n.h         \
        gi18n-lib.h     \
        giochannel.h    \
@@ -212,6 +223,7 @@ glibsubinclude_HEADERS =   \
        gnode.h         \
        goption.h       \
        gpattern.h      \
+       gpoll.h         \
        gprimes.h       \
        gqsort.h        \
        gquark.h        \
@@ -237,6 +249,7 @@ glibsubinclude_HEADERS =   \
        gunicode.h      \
        gurifuncs.h             \
        gutils.h        \
+       gvarianttype.h  \
        gwin32.h        \
        gprintf.h
 
@@ -300,12 +313,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 $@
@@ -331,7 +358,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
@@ -339,10 +366,34 @@ 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)'; \
        for f in $$files; do \
          if test -f $$f; then d=.; else d=$(srcdir); fi; \
          cp $$d/$$f $(distdir) || exit 1; done
+
+distclean-local:
+       if test $(srcdir) = .; then :; else \
+           rm -f libglib-gdb.py; \
+       fi
+
+# install gdb scripts
+gdbdir = $(datadir)/glib-2.0/gdb
+dist_gdb_SCRIPTS = glib.py
+
+libglib-gdb.py: libglib-gdb.py.in
+       sed -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+
+
+install-data-hook: libglib-gdb.py
+       mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
+       $(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+if HAVE_GLIB_RUNTIME_LIBDIR
+       mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+       mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+       mv $(DESTDIR)$(libdir)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
+       rm -f $(DESTDIR)$(libdir)/libglib-2.0.so
+       ln -s $(GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION) $(DESTDIR)$(libdir)/libglib-2.0.so
+endif