Updated gujarati file

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 65142f2..98d91af 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -49,15 +49,7 @@ AM_CPPFLAGS =                                \
        -DGLIB_COMPILATION              \
        -DPCRE_STATIC
 
-glib.def: glib.symbols
-       $(AM_V_GEN) (echo EXPORTS; $(CPP) -P -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/  /') > $(builddir)/glib.def
-
-if OS_LINUX
-if HAVE_GNUC_VISIBILITY
-TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
-TESTS = abicheck.sh
-endif
-endif
+AM_CFLAGS = $(GLIB_WARN_CFLAGS)
 
 MIRRORING_TAB_SOURCE =                                 \
        glib-mirroring-tab/Makefile             \
@@ -74,8 +66,6 @@ EXTRA_DIST +=                         \
        gen-unicode-tables.pl   \
        gen-script-table.pl     \
        glibconfig.h.win32.in   \
-       abicheck.sh             \
-       glib.symbols            \
        gregex.c                \
        gregex.h                \
        win_iconv.c             \
@@ -84,7 +74,7 @@ EXTRA_DIST +=                         \
        gconstructor.h          \
        $(MIRRORING_TAB_SOURCE)
 
-CLEANFILES= libglib-gdb.py
+CLEANFILES += libglib-gdb.py
 
 # These may be in the builddir too
 BUILT_EXTRA_DIST =             \
@@ -131,6 +121,7 @@ libglib_2_0_la_SOURCES =    \
        gbytes.c                \
        gbytes.h                \
        gcharset.c              \
+       gcharsetprivate.h       \
        gchecksum.c             \
        gconvert.c              \
        gdataset.c              \
@@ -168,6 +159,7 @@ libglib_2_0_la_SOURCES =    \
        gpoll.c                 \
        gprimes.c               \
        gqsort.c                \
+       gquark.c                \
        gqueue.c                \
        grand.c                 \
        gregex.c                \
@@ -222,11 +214,13 @@ if OS_UNIX
 libglib_2_0_la_SOURCES += glib-unix.c
 endif
 
-if OS_WIN32
+if THREADS_WIN32
 libglib_2_0_la_SOURCES += gthread-win32.c
 else
+if THREADS_POSIX
 libglib_2_0_la_SOURCES += gthread-posix.c
 endif
+endif
 
 EXTRA_libglib_2_0_la_SOURCES = \
        giounix.c       \
@@ -333,37 +327,22 @@ CLEANFILES += glib-public-headers.txt
 
 all-local: glib-public-headers.txt
 
-install-data-local: install-ms-lib install-def-file
+install-data-local: install-ms-lib
        @if test -f $(glibincludedir)/glist.h ; then                                    \
          echo "*** Old headers found in $(glibincludedir). You should remove the" ;    \
          echo "*** contents of this directory and type 'make install' again." ;        \
          false ;                                                                       \
        fi
 
-uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-gdb
+uninstall-local: uninstall-ms-lib uninstall-gdb
 
 if PLATFORM_WIN32
 no_undefined = -no-undefined
 endif
 
 if OS_WIN32_AND_DLL_COMPILATION
-export_symbols = -export-symbols $(builddir)/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) $(builddir)/glib.def $(DESTDIR)$(libdir)/glib-2.0.def
-
-uninstall-def-file:
-       -rm $(DESTDIR)$(libdir)/glib-2.0.def
-else
-install-def-file:
-uninstall-def-file:
-
-export_symbols = $(LIBTOOL_EXPORT_OPTIONS)
 endif
 
 if USE_SYSTEM_PCRE
@@ -374,13 +353,14 @@ pcre_lib = pcre/libpcre.la
 pcre_inc =
 endif
 
+libglib_2_0_la_CFLAGS = $(AM_CFLAGS) $(GLIB_HIDDEN_VISIBILITY_CFLAGS)
 libglib_2_0_la_LIBADD = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ @ICONV_LIBS@ @G_LIBS_EXTRA@ $(pcre_lib) $(G_THREAD_LIBS_EXTRA) $(G_THREAD_LIBS_FOR_GTHREAD)
 libglib_2_0_la_DEPENDENCIES = libcharset/libcharset.la $(printf_la) @GIO@ @GSPAWN@ @PLATFORMDEP@ $(glib_win32_res) $(glib_def)
 
 libglib_2_0_la_LDFLAGS = $(GLIB_LINK_FLAGS) \
         $(glib_win32_res_ldflag) \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -export-dynamic $(no_undefined) $(export_symbols)
+       -export-dynamic $(no_undefined)
 
 INSTALL_PROGS=
 
@@ -452,7 +432,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.*|#!${PYTHON}|' \
          || exit $$? ; \
          chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
          rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \