Move to corresponding subdirectories.

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

diff --git a/Makefile.am b/Makefile.am
index a06082f..36518c7 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 
-all-recursive-am: all-am
-# alpha `automake' supports this better
-#SUBDIRS = . gmodule docs
+AUTOMAKE_OPTIONS = 1.4
 
-configincludedir = $(pkglibdir)/include
+SUBDIRS = . gmodule gthread docs tests
 
 bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
@@ -15,59 +11,78 @@ glib-config: glib-config.in
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST = \
-       glib.m4         \
-       glib.spec       \
-       sanity_check    \
-       README.win32    \
-       glib.def        \
-       makefile.lcc    \
-       makefile.msc    \
-       glibconfig.h.win32
+       glib.m4                 \
+       glib.spec.in            \
+       acglib.m4               \
+       sanity_check            \
+       README.win32            \
+       glib.def                \
+       makefile.msc            \
+       makefile.cygwin         \
+       giowin32.c              \
+       glibconfig.h.win32      \
+       gwin32.c                \
+       config.h.win32          \
+       build-dll               \
+       glib.rc
 
 lib_LTLIBRARIES = libglib.la
 
 libglib_la_SOURCES = \
-               garray.c        \
-               gcache.c        \
-               gcompletion.c   \
-               gdataset.c      \
-                gdate.c         \
-               gerror.c        \
-               ghash.c         \
-               ghook.c         \
-               glist.c         \
-               gmain.c         \
-               giochannel.c    \
-               giounix.c       \
-               gmem.c          \
-               gmessages.c     \
-               gnode.c         \
-               gprimes.c       \
-               gslist.c        \
-               gtimer.c        \
-               gtree.c         \
-               grel.c          \
-               gstring.c       \
-               gstrfuncs.c     \
-               gscanner.c      \
-               gutils.c        \
-               gmutex.c
+       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
+       glib.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)
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+       -release $(LT_RELEASE) \
+       -export-dynamic
 
 noinst_PROGRAMS = testglib testgdate testgdateparser
 testglib_LDADD = libglib.la
@@ -77,6 +92,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.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.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:
@@ -94,3 +124,6 @@ sanity:
 
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)`date +"%y%m%d"`
+
+dist-hook:
+       cp glib.spec $(distdir)