Add gspawn-win32.c to EXTRA_DIST.

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

diff --git a/glib/Makefile.am b/glib/Makefile.am
index 280477a..5f1fe7a 100644 (file)
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -19,24 +19,29 @@ EXTRA_DIST =                        \
        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                 \
        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.spec
+
 lib_LTLIBRARIES = libglib-1.3.la
 
 libglib_1_3_la_SOURCES =       \
@@ -78,18 +83,53 @@ libglib_1_3_la_SOURCES =    \
        gunichartables.h        \
        gunidecomp.h            \
        gunidecomp.c            \
-       gutils.c                \
-       @ALLOCA@
+       gutils.c
+
+## 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        \
-       gunicode.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
@@ -161,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