Update.

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

diff --git a/Makefile.am b/Makefile.am
index ae5fedc..435167e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,79 +2,40 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests
+SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
 
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
-
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+       -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
 
 EXTRA_DIST =                   \
        ChangeLog.pre-1-2       \
-       glib.m4                 \
        glib.spec.in            \
+       NEWS.pre-1-3            \
        acglib.m4               \
        sanity_check            \
        README.win32            \
        TODO.xml                \
-       glib.def                \
        makefile.msc            \
-       makefile.msc.in         \
        makefile.mingw          \
-       makefile.mingw.in       \
-       giowin32.c              \
-       glibconfig.h.win32      \
        glibconfig.h.win32.in   \
-       gwin32.c                \
-       config.h.win32          \
        config.h.win32.in       \
-       build-dll               \
-       glib.rc                 \
-       glib.rc.in
-
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES =           \
-       garray.c                \
-       gasyncqueue.c           \
-       gbacktrace.c            \
-       gcache.c                \
-       gcompletion.c           \
-       gdataset.c              \
-       gdate.c                 \
-       gerror.c                \
-       ghash.c                 \
-       ghook.c                 \
-       giochannel.c            \
-       giounix.c               \
-       glist.c                 \
-       gmain.c                 \
-       gmem.c                  \
-       gmessages.c             \
-       gnode.c                 \
-       gprimes.c               \
-       gqueue.c                \
-       grel.c                  \
-       grand.c                 \
-       gscanner.c              \
-       gslist.c                \
-       gstrfuncs.c             \
-       gstring.c               \
-       gthread.c               \
-       gthreadpool.c           \
-       gtimer.c                \
-       gtree.c                 \
-       guniprop.c              \
-       gutf8.c                 \
-       gunichartables.h        \
-       gunidecomp.h            \
-       gunidecomp.c            \
-       gutils.c
-
-include_HEADERS = glib.h glib-object.h gunicode.h gerror.h
-
-configexecincludedir = $(pkglibdir)/include
+        po/po2tbl.sed.in        \
+       glib-2.0.pc.in          \
+       gobject-2.0.pc.in       \
+       gmodule-2.0.pc.in       \
+       gthread-2.0.pc.in       \
+       glib-2.0-uninstalled.pc.in      \
+       gobject-2.0-uninstalled.pc.in   \
+       gmodule-2.0-uninstalled.pc.in   \
+       gthread-2.0-uninstalled.pc.in
+
+# These may be in the builddir too
+BUILT_EXTRA_DIST =             \
+       glibconfig.h.win32      \
+       config.h.win32          \
+       glib.spec
+
+configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
 
 install-exec-local: glibconfig.h
@@ -83,7 +44,7 @@ install-exec-local: glibconfig.h
        if test -r $$file && cmp -s glibconfig.h $$file; then :; \
        else $(INSTALL_DATA) glibconfig.h $$file; fi
 
-configure: configure.in acglib.m4              
+CONFIGURE_DEPENDENCIES = acglib.m4
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
 glibconfig.h: stamp-gc-h
@@ -93,18 +54,11 @@ stamp-gc-h: config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-libglib_la_LDFLAGS = \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-       -release $(LT_RELEASE) \
-       -export-dynamic
 
-noinst_PROGRAMS = testglib testgdate testgdateparser
-testglib_LDADD = libglib.la
-testgdate_LDADD = libglib.la
-testgdateparser_LDADD = libglib.la
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = glib.m4
+$(pkgconfig_DATA): config.status
 
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -112,14 +66,7 @@ glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win
 config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/makefile.mingw.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
-       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+DISTCLEANFILES = glibconfig-sysdefs.h glibconfig.h stamp-gc-h
 
 .PHONY: files release sanity snapshot
 
@@ -142,5 +89,9 @@ snapshot:
 snapcheck:
        $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-dist-hook:
-       cp glib.spec $(distdir)
+dist-hook: $(BUILT_EXTRA_DIST)
+       cd $(top_builddir) && CONFIG_FILES="INSTALL README" CONFIG_HEADERS= $(SHELL) ./config.status
+       files='$(BUILT_EXTRA_DIST) INSTALL README'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         rm -f $(distdir)/$$f && cp $$d/$$f $(distdir) || exit 1; done