diff options
| author | James Henstridge <james@daa.com.au> | 2003-03-11 12:31:16 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-03-11 12:31:16 +0000 |
| commit | bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08 (patch) | |
| tree | 26110dd7a72388712a01aad97aa1ce4ed29f4eb1 /tests | |
| parent | 411bd8c907fbf018a8d7529b6a858a8c11f87bd3 (diff) | |
| download | pango-bdd7e7f65c9f97b397b4ebe2550a6c2752adfe08.tar.gz | |
make similar changes to the ones on glib head (call gtk-docize, etc).
2003-03-11 James Henstridge <james@daa.com.au>
* 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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 52 |
1 files changed, 19 insertions, 33 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 513e46b0..ac4d0bb2 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,29 +1,5 @@ ## Process this file with automake to create Makefile.in. -if HAVE_XFT -X_DEFINES=-DHAVE_X -else -X_DEFINES= -endif - -if HAVE_XFT -XFT_DEFINES=-DHAVE_XFT -else -XFT_DEFINES= -endif - -if HAVE_FREETYPE -FT2_DEFINES=-DHAVE_FREETYPE -else -FT2_DEFINES= -endif - -if HAVE_WIN32 -WIN32_DEFINES=-DHAVE_WIN32 -else -WIN32_DEFINES= -endif - INCLUDES = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ @@ -31,18 +7,28 @@ INCLUDES = \ $(FONTCONFIG_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ - $(X_DEFINES) \ - $(XFT_DEFINES) \ - $(FT2_DEFINES) \ - $(WIN32_DEFINES) \ -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) +if HAVE_XFT +INCLUDES += -DHAVE_X +endif +if HAVE_XFT +INCLUDES += -DHAVE_XFT +endif +if HAVE_FREETYPE +INCLUDES += -DHAVE_FREETYPE +endif +if HAVE_WIN32 +INCLUDES += -DHAVE_WIN32 +endif + + TESTS=runtests.sh noinst_PROGRAMS = gen-all-unicode dump-boundaries -check_PROGRAMS = testboundaries testcolor $(CXX_TEST) +check_PROGRAMS = testboundaries testcolor gen_all_unicode_SOURCES = gen-all-unicode.c @@ -61,11 +47,10 @@ testcolor_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la dump_boundaries_LDADD = ../pango/libpango-$(PANGO_API_VERSION).la if HAVE_CXX -CXX_TEST = cxx-test -cxx_test_SOURCES = cxx-test.C -else -CXX_TEST = +check_PROGRAMS += cxx-test endif +cxx_test_SOURCES = cxx-test.C + EXTRA_DIST = \ all-unicode.txt \ @@ -77,3 +62,4 @@ all-unicode.txt: gen-all-unicode all-local: all-unicode.txt +DISTCLEANFILES = all-unicode.txt runtests.log |