From 312e1c1cf9f2c1e2137b9aaa5181a541447923cb Mon Sep 17 00:00:00 2001 From: James Henstridge Date: Tue, 11 Mar 2003 12:31:16 +0000 Subject: [PATCH] make similar changes to the ones on glib head (call gtk-docize, etc). 2003-03-11 James Henstridge * autogen.sh: make similar changes to the ones on glib head (call gtk-docize, etc). * configure.in: move some calculations into M4 macros, rather than calculating them when configure runs. Use AC_HELP_STRING where appropriate. Replace gtk-doc checks with a call to GTK_DOC_CHECK. Replace AC_OUTPUT_COMMANDS() call with a number of calls to AC_CONFIG_COMMANDS (once per created file). Get rid of the "chmod +x pango-config" bit, because there is no pango-config anymore. * Makefile.am: get rid of custom distcheck rule, and set DISTCHECK_CONFIGURE_FLAGS, which is equivalent. Use += to select which .pc files to install. * pango/Makefile.am: Add rules to rebuild module-defs* files, and remove them on clean. Reorder so that rules related to each individual library are next to each other. Use BUILT_SOURCES for built sources. * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. * modules/*/Makefile.am: simplify module makefiles through use of +=, and regularise them a bit (fixed a few bugs in the process). * docs/Makefile.am: remove common rules, and instead include gtk-doc.make. * examples/Makefile.am: add pango.modules to CLEANFILES. * tests/Makefile.am: remove temporary files on clean. --- src/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 3acf7546e..969b2dbcc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,12 +11,11 @@ INCLUDES = \ $(X_CFLAGS) \ -I$(top_srcdir) -LDADDS = @STRIP_BEGIN@ \ - @x_ldflags@ \ - @x_libs@ \ - @GLIB_LIBS@ \ - -lm \ -@STRIP_END@ +LDADDS = \ + $(x_ldflags) \ + $(x_libs) \ + $(GLIB_LIBS) \ + -lm noinst_LTLIBRARIES = libpango-ot.la