diff options
| author | Raja R Harinath <harinath@src.gnome.org> | 2000-10-16 01:02:19 +0000 |
|---|---|---|
| committer | Raja R Harinath <harinath@src.gnome.org> | 2000-10-16 01:02:19 +0000 |
| commit | a626a650e533eba3ee76f4c8375cf41bc964f6cf (patch) | |
| tree | 067e983978a01d330e221c0bc352a8a43fbf2a83 /glib | |
| parent | eb27cad0f0495e9e74f06650eb40448f196e2b7b (diff) | |
| download | glib-a626a650e533eba3ee76f4c8375cf41bc964f6cf.tar.gz | |
gmodule: New variable. (dist-hook): Handle $(BUILT_EXTRA_DIST).
gmodule:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
gobject:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
(*): Remove traces of @STRIP_{BEGIN,END}@.
gthread:
* Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
docs/reference:
'make distcheck' fixes.
* glib/Makefile.am (EXTRA_DIST): Add $(DOC_MODULE)-decl.txt.
(html): Run 'gtkdoc-fixxref' in $(srcdir).
(dist-check-gtkdoc): Add missing quote.
(dist-hook): Copy in dependency order, so that none of the
makerules are fired in a tarball build.
* gobject/Makefile.am: Likewise.
toplevel:
Remove need for acconfig.h, and misc. cleanups.
* acglib.m4 (GLIB_SIZEOF): Add 'autoheader' comment to
AC_DEFINE_UNQUOTED.
(GLIB_BYTE_CONTENTS): Likewise.
* configure.in: Add 'autoheader' comments to all AC_DEFINE(...)
and AC_DEFINE_UNQUOTED(...) lines.
Replace AC_MSG_CHECKING/AC_CACHE_VAL with AC_CACHE_CHECK.
(AM_PROG_LIBTOOL): Move after AC_PROG_CC.
* acconfig.h: Empty out.
* Makefile.am (BUILT_EXTRA_DIST): New variable. List 'dist'able
files that are created in the builddir.
(dist-hook): Handle those files.
(libglib_1_3_la_SOURCES): Remove @ALLOCA@. @ALLOCA@ should only
be used in an _LDADD or _LIBADD, since it expands (if necessary)
to 'alloca.o'.
* tests/Makefile.am (BUILT_EXTRA_DIST): New variable.
(dist-hook): Handle $(BUILT_EXTRA_DIST).
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/Makefile.am | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/glib/Makefile.am b/glib/Makefile.am index dd0a2e509..efb1bcc37 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -19,24 +19,28 @@ 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 \ 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,8 +82,10 @@ 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 = \ @@ -194,5 +200,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 |