From 348c8f102f9b742aa74c2e4f1b6e67f87b084b6c Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 15 May 2001 22:07:21 +0000 Subject: m4macros/Makefile 2001-05-15 Havoc Pennington * configure.in (AC_OUTPUT): m4macros/Makefile * m4macros/Makefile.am, m4macros/glib-2.0.m4, m4macros/glib-gettext.m4: m4 files moved here on server, Makefile.am added This is so you can aclocal -I m4macros while avoiding acinclude.m4 * Makefile.am: add m4macros subdir, remove references to glib-2.0.m4 --- Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index ae51ab046..c959c43f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,14 +2,13 @@ AUTOMAKE_OPTIONS = 1.4 -SUBDIRS = . gobject gmodule gthread docs tests build +SUBDIRS = . m4macros gobject gmodule gthread docs tests build INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION EXTRA_DIST = \ ChangeLog.pre-1-2 \ - glib-2.0.m4 \ glib.spec.in \ NEWS.pre-1-3 \ acglib.m4 \ @@ -188,8 +187,6 @@ testgdateparser_LDADD = libglib-1.3.la if ENABLE_TIMELOOP timeloop_LDADD = libglib-1.3.la endif -m4datadir = $(datadir)/aclocal -m4data_DATA = glib-2.0.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc -- cgit v1.2.3