Rename the GUTILS_C_VAR macro to GLIB_VAR.

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

diff --git a/Makefile.am b/Makefile.am
index b36864e..f47fff2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-# build . first, then SUBDIRS
-SUBDIRS = gmodule gthread docs tests
-all-recursive-am: all-am
-# alpha `automake' supports this better
-#SUBDIRS = . gmodule gthread docs tests
+AUTOMAKE_OPTIONS = 1.4
 
-configincludedir = $(pkglibdir)/include
+SUBDIRS = . gobject gmodule gthread docs tests
 
 bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
@@ -14,64 +10,92 @@ glib-config: glib-config.in
 
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
 
-EXTRA_DIST = \
+EXTRA_DIST =                   \
+       ChangeLog.pre-1-2       \
        glib.m4                 \
-       glib.spec               \
+       glib.spec.in            \
        acglib.m4               \
        sanity_check            \
        README.win32            \
+       TODO.xml                \
        glib.def                \
-       makefile.lcc            \
        makefile.msc            \
-       glibconfig.h.win32
+       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        \
-       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     \
-       gmutex.c        \
-       gnode.c         \
-       gprimes.c       \
-       grel.c          \
-       gscanner.c      \
-       gslist.c        \
-       gstrfuncs.c     \
-       gstring.c       \
-       gtimer.c        \
-       gtree.c         \
+libglib_la_SOURCES =           \
+       garray.c                \
+       gasyncqueue.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
+include_HEADERS = glib.h glib-object.h gunicode.h
 
-configinclude_DATA = \
-       glibconfig.h
+configexecincludedir = $(pkglibdir)/include
+#configexecinclude_DATA = glibconfig.h
+
+install-exec-local: glibconfig.h
+       $(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
+       file=$(DESTDIR)$(configexecincludedir)/glibconfig.h; \
+       if test -r $$file && cmp -s glibconfig.h $$file; then :; \
+       else $(INSTALL_DATA) glibconfig.h $$file; fi
 
 configure: configure.in acglib.m4              
 
 BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
 glibconfig.h: stamp-gc-h
-       @:
+       @if test -f glibconfig.h; then :; \
+       else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
 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)
+       -release $(LT_RELEASE) \
+       -export-dynamic
 
 noinst_PROGRAMS = testglib testgdate testgdateparser
 testglib_LDADD = libglib.la
@@ -81,6 +105,21 @@ testgdateparser_LDADD = libglib.la
 m4datadir = $(datadir)/aclocal
 m4data_DATA = glib.m4
 
+glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
+       cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+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
+
 .PHONY: files release sanity snapshot
 
 files:
@@ -97,4 +136,10 @@ sanity:
        ./sanity_check $(VERSION)
 
 snapshot:
-       $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+       $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+snapcheck:
+       $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
+
+dist-hook:
+       cp glib.spec $(distdir)