Default to --disable-gtk-doc, to avoid Jade setup hassles.
[platform/upstream/glib.git] / Makefile.am
index 8e9ace6..ce53445 100644 (file)
@@ -2,64 +2,47 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gmodule gthread docs tests
+SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
+bin_SCRIPTS = glib-gettextize
 
-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 = \
-       glib.m4                 \
+EXTRA_DIST =                   \
+       ChangeLog.pre-1-2       \
        glib.spec.in            \
+       glib-zip.in             \
+       NEWS.pre-1-3            \
        acglib.m4               \
        sanity_check            \
+       README.in               \
+       INSTALL.in              \
        README.win32            \
-       glib.def                \
+       TODO.xml                \
        makefile.msc            \
-       makefile.cygwin         \
-       giowin32.c              \
+       makefile.mingw          \
+       glibconfig.h.win32.in   \
+       msvc_recommended_pragmas.h \
+       config.h.win32.in       \
+        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      \
-       gwin32.c                \
        config.h.win32          \
-       build-dll
-
-lib_LTLIBRARIES = libglib.la
-
-libglib_la_SOURCES = \
-       garray.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       \
-       gtimer.c        \
-       gtree.c         \
-       gutils.c
-
-include_HEADERS = \
-       glib.h
-
-configexecincludedir = $(pkglibdir)/include
+       glib.spec               \
+       glib-zip
+
+configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
 
 install-exec-local: glibconfig.h
@@ -68,7 +51,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
@@ -78,18 +61,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
@@ -97,11 +73,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.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.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
 
@@ -119,7 +91,38 @@ sanity:
        ./sanity_check $(VERSION)
 
 snapshot:
-       $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
-
-dist-hook:
-       cp glib.spec $(distdir)
+       $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+snapcheck:
+       $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+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
+
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+       -rm -rf $(distdir)
+       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+       mkdir $(distdir)/=build
+       mkdir $(distdir)/=inst
+       dc_install_base=`cd $(distdir)/=inst && pwd`; \
+       cd $(distdir)/=build \
+         && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+         && $(MAKE) $(AM_MAKEFLAGS) \
+         && $(MAKE) $(AM_MAKEFLAGS) dvi \
+         && $(MAKE) $(AM_MAKEFLAGS) check \
+         && $(MAKE) $(AM_MAKEFLAGS) install \
+         && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+         && $(MAKE) $(AM_MAKEFLAGS) dist
+       -rm -rf $(distdir)
+       @banner="$(distdir).tar.gz is ready for distribution"; \
+       dashes=`echo "$$banner" | sed s/./=/g`; \
+       echo "$$dashes"; \
+       echo "$$banner"; \
+       echo "$$dashes"