Add gspawn-win32.c to EXTRA_DIST.

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

diff --git a/Makefile.am b/Makefile.am
index f47fff2..5f1fe7a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,47 +2,59 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = . gobject gmodule gthread docs tests
+SUBDIRS = . gobject gmodule gthread docs tests build
 
-bin_SCRIPTS=glib-config
-BUILT_SOURCES=glib-config
-glib-config: glib-config.in
+bin_SCRIPTS=glib-config-2.0
+BUILT_SOURCES=glib-config-2.0
+glib-config-2.0: glib-config-2.0.in
 
 INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@
 
 EXTRA_DIST =                   \
        ChangeLog.pre-1-2       \
-       glib.m4                 \
+       glib-2.0.m4             \
        glib.spec.in            \
        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          \
+       gspawn-win32.c          \
        config.h.win32.in       \
        build-dll               \
+       glib.rc.in              \
+       glib-2.0.pc.in          \
+       gobject-2.0.pc.in       \
+       gmodule-2.0.pc.in       \
+       gthread-2.0.pc.in
+
+# These may be in the builddir too
+BUILT_EXTRA_DIST = \
+       makefile.msc            \
+       makefile.mingw          \
+       glibconfig.h.win32      \
+       config.h.win32          \
        glib.rc                 \
-       glib.rc.in
+       glib.spec
 
-lib_LTLIBRARIES = libglib.la
+lib_LTLIBRARIES = libglib-1.3.la
 
-libglib_la_SOURCES =           \
+libglib_1_3_la_SOURCES =       \
        garray.c                \
        gasyncqueue.c           \
+       gbacktrace.c            \
        gcache.c                \
        gcompletion.c           \
+       gconvert.c              \
        gdataset.c              \
        gdate.c                 \
        gerror.c                \
+       gfileutils.c            \
        ghash.c                 \
        ghook.c                 \
        giochannel.c            \
@@ -57,7 +69,9 @@ libglib_la_SOURCES =          \
        grel.c                  \
        grand.c                 \
        gscanner.c              \
+       gshell.c                \
        gslist.c                \
+       gspawn.c                \
        gstrfuncs.c             \
        gstring.c               \
        gthread.c               \
@@ -71,9 +85,53 @@ libglib_la_SOURCES =                 \
        gunidecomp.c            \
        gutils.c
 
-include_HEADERS = glib.h glib-object.h gunicode.h
-
-configexecincludedir = $(pkglibdir)/include
+## If we decide to link in 'alloca.c', this is how to do it
+#libglib_1_3_la_LIBADD = @ALLOCA@
+
+glibincludedir=$(includedir)/glib-2.0
+glibinclude_HEADERS =   \
+       galloca.h       \
+       garray.h        \
+       gasyncqueue.h   \
+       gbacktrace.h    \
+       gcache.h        \
+       gcompletion.h   \
+       gconvert.h      \
+       gdataset.h      \
+       gdate.h         \
+       gerror.h        \
+       gfileutils.h    \
+       ghash.h         \
+       ghook.h         \
+       giochannel.h    \
+       glib.h          \
+       glib-object.h   \
+       glist.h         \
+       gmacros.h       \
+       gmain.h         \
+       gmem.h          \
+       gmessages.h     \
+       gnode.h         \
+       gprimes.h       \
+       gquark.h        \
+       gqueue.h        \
+       grand.h         \
+       grel.h          \
+       gscanner.h      \
+       gshell.h        \
+       gslist.h        \
+       gspawn.h        \
+       gstrfuncs.h     \
+       gstring.h       \
+       gthread.h       \
+       gthreadpool.h   \
+       gtimer.h        \
+       gtree.h         \
+       gtypes.h        \
+       gunicode.h      \
+       gutils.h
+
+configexecincludedir = $(libdir)/glib-2.0/include
 #configexecinclude_DATA = glibconfig.h
 
 install-exec-local: glibconfig.h
@@ -82,7 +140,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
@@ -92,18 +150,20 @@ stamp-gc-h: config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_OTHER=glibconfig.h ./config.status
        echo timestamp > stamp-gc-h
 
-libglib_la_LDFLAGS = \
+libglib_1_3_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
+testglib_LDADD = libglib-1.3.la
+testgdate_LDADD = libglib-1.3.la
+testgdateparser_LDADD = libglib-1.3.la
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = glib.m4
+m4data_DATA = glib-2.0.m4
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc
 
 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -141,5 +201,8 @@ snapshot:
 snapcheck:
        $(MAKE) distcheck distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
 
-dist-hook:
-       cp glib.spec $(distdir)
+dist-hook: $(BUILT_EXTRA_DIST)
+       files='$(BUILT_EXTRA_DIST)'; \
+       for f in $$files; do \
+         if test -f $$f; then d=.; else d=$(srcdir); fi; \
+         cp $$d/$$f $(distdir) || exit 1; done