added g_array_insert_vals() to insert elements at an arbitrary index, and

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

diff --git a/Makefile.am b/Makefile.am
index 829a7c7..bf03bcc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
+# build . first, then SUBDIRS
 SUBDIRS = gmodule docs
+all-recursive-am: all-am
+# alpha `automake' supports this better
+#SUBDIRS = . gmodule docs
 
 configincludedir = $(pkglibdir)/include
 
@@ -8,15 +12,17 @@ bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in
 
-DEFS += -DG_LOG_DOMAIN=g_log_domain_glib
-
-EXTRA_DIST =                   \
-               glib.m4         \
-               glib.spec       \
-               sanity_check
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib
 
-# build . first, then SUBDIRS
-all-recursive-am: all-am
+EXTRA_DIST = \
+       glib.m4         \
+       glib.spec       \
+       sanity_check    \
+       README.win32    \
+       glib.def        \
+       makefile.lcc    \
+       makefile.msc    \
+       glibconfig.h.win32
 
 lib_LTLIBRARIES = libglib.la
 
@@ -48,9 +54,15 @@ include_HEADERS = \
 configinclude_DATA = \
                glibconfig.h
 
+BUILT_SOURCES = stamp-gc-h #note: not glibconfig.h
+glibconfig.h: stamp-gc-h
+       @:
+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)
-INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = testglib
 testglib_LDADD = libglib.la