diff options
| author | James Henstridge <james@daa.com.au> | 2003-03-04 10:10:48 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-03-04 10:10:48 +0000 |
| commit | c4391cbf37536440e7cf6c21f4731f19833f59f9 (patch) | |
| tree | 4f41dd52fec863e76b41657636e60249ec56ee02 /gmodule | |
| parent | 6f988777288b6e2319dddea6ed0081ec242e71a0 (diff) | |
require automake 1.7. Add calls to libtoolize and gtkdocize. Clean up some
2003-03-01 James Henstridge <james@daa.com.au>
* autogen.sh: require automake 1.7. Add calls to libtoolize and
gtkdocize. Clean up some of the error messages.
* configure.in: move version declaration to the top of the file
(before AC_INIT), using M4 macros.
GLIB_AC_DIVERT_BEFORE_HELP() calls no longer necessary, due to use
of M4 macro expansion in help messages instead.
Convert AC_ARG_WITH/AC_ARG_ENABLE calls to use AC_HELP_STRING to
format help strings. Use quadrigraphs to get square brackets to
show correctly.
Replace gtk-doc checks with a call to GTK_DOC_CHECK() macro.
Use AC_CONFIG_COMMANDS([glibconfig.h], ...) to output
glibconfig.h, so that "./config.status glibconfig.h" works.
Add an extra AC_CONFIG_FILES call listing other files we want
generated by config.status protected by an "if false" block. This
way automake generates the rules needed to rebuild the files for
us.
Add quotes in various places.
* docs/reference/*/Makefile.am: convert to use the common
gtk-doc.make file. This localises the complexity to a single
makefile fragment maintained with gtk-doc itself.
* */Makefile.am: remove unneeded rules to build win32 files with
config.status. Automake now does this for us.
Replace instances of @FOO@ with $(FOO) where appropriate -- this
allows automake to do a better job checking the makefile.
Add some files to DISTCLEANFILES where appropriate
* Makefile.am: use the DISTCHECK_CONFIGURE_FLAGS variable to
ensure that --enable-gtk-doc is passed to configure during a
distcheck. Remove the custom distcheck, since the standard one
will now do.
* gobject/Makefile.am: switch to BUILT_SOURCES, since that now
works.
Diffstat (limited to 'gmodule')
| -rw-r--r-- | gmodule/Makefile.am | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am index 2007f70fd..ad70c70ed 100644 --- a/gmodule/Makefile.am +++ b/gmodule/Makefile.am @@ -68,30 +68,21 @@ endif libgmodule_2_0_la_SOURCES = gmodule.c libgmodule_2_0_la_LDFLAGS = \ - @G_MODULE_LDFLAGS@ \ + $(G_MODULE_LDFLAGS) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -export-dynamic $(no_undefined) $(export_symbols) -libgmodule_2_0_la_LIBADD = @G_MODULE_WIN32_RESOURCE@ @G_MODULE_LIBS_EXTRA@ @G_MODULE_LIBS@ $(libglib) +libgmodule_2_0_la_LIBADD = $(G_MODULE_WIN32_RESOURCE) $(G_MODULE_LIBS_EXTRA) $(G_MODULE_LIBS) $(libglib) -libgmodule_2_0_la_DEPENDENCIES = @G_MODULE_WIN32_RESOURCE@ @GMODULE_DEF@ +libgmodule_2_0_la_DEPENDENCIES = $(G_MODULE_WIN32_RESOURCE) $(GMODULE_DEF) if OS_WIN32 -@G_MODULE_WIN32_RESOURCE@ : gmodule.rc - $(top_srcdir)/build/win32/lt-compile-resource gmodule.rc @G_MODULE_WIN32_RESOURCE@ +$(G_MODULE_WIN32_RESOURCE): gmodule.rc + $(top_srcdir)/build/win32/lt-compile-resource gmodule.rc $@ endif gmodule-2.0.lib: libgmodule-2.0.la gmodule.def - lib -name:libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gmodule.def -out:$@ - -gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule/gmodule.rc.in - cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.mingw.in - cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -makefile.msc: $(top_builddir)/config.status $(top_srcdir)/gmodule/makefile.msc.in - cd $(top_builddir) && CONFIG_FILES=gmodule/$@ CONFIG_HEADERS= $(SHELL) ./config.status + lib -name:libgmodule-2.0-$(LT_CURRENT_MINUS_AGE).dll -def:gmodule.def -out:$@ .PHONY: files release |