summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.am16
-rw-r--r--configure.ac8
3 files changed, 28 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e04da59..dbc64b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
ChangeLog for X.Org 7.0 modular release:
+2005-07-29 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * Makefile.am:
+ * configure.ac:
+ Update release version
+ Fix build to use pkgconfig
+ Fix make distcheck
+
2005-05-22 Alan Coopersmith <alan.coopersmith@sun.com>
* Makefile.am (man1_MANS): Add makedepend man page
diff --git a/Makefile.am b/Makefile.am
index 49675d9..355b2f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,18 @@
bin_PROGRAMS = makedepend
man1_MANS = makedepend.man
-INCLUDES = -I${includedir} -I${includedir}/X11
-makedepend_SOURCES = include.c main.c parse.c pr.c cppsetup.c ifparser.c
+INCLUDES = @X_CFLAGS@
+
+makedepend_SOURCES = include.c \
+ main.c \
+ parse.c \
+ pr.c \
+ cppsetup.c \
+ ifparser.c \
+ ifparser.h \
+ def.h \
+ imakemdep.h
+
makedepend_CPPFLAGS = -DOBJSUFFIX=\".${OBJEXT}\" -DINCLUDEDIR=\"/usr/include\"
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh makedepend.man
diff --git a/configure.ac b/configure.ac
index a7288b0..12d57cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl $XdotOrg: $
AC_PREREQ([2.57])
-AC_INIT([makedepend], [7.0], [xorg@lists.freedesktop.org])
+AC_INIT([makedepend], [0.99.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_CONFIG_HEADER([makedepend-config.h])
@@ -16,4 +16,10 @@ AC_CHECK_FUNCS([rename fchmod])
dnl Use 64-bit file operations on 32-bit systems that support them
AC_SYS_LARGEFILE
+dnl Check for pkg-config packages
+PKG_CHECK_MODULES(X, [xproto])
+AC_SUBST(X_CFLAGS)
+
+XORG_RELEASE_VERSION
+
AC_OUTPUT([Makefile])