summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-10-26 12:54:23 -0400
committerGaetan Nadon <memsize@videotron.ca>2009-10-26 12:54:23 -0400
commitdcb3d3ed2ba2129b433eee0d18ec86e1e0a6f21f (patch)
tree93c9e8175cadbad8c3c39e397aea588a66e0ce59
parenta9dc11de80966fe00efb6c061a6df00678f80b1f (diff)
Several driver modules do not have a ChangeLog target in Makefile.am #23814
The git generated ChangeLog replaces the hand written one. Update configure.ac to xorg-macros level 1.3. Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros Update Makefile.am to add ChangeLog target if missing Remove ChangeLog from EXTRA_DIST or *CLEAN variables This is a pre-req for the INSTALL_CMD
-rw-r--r--ChangeLog95
-rw-r--r--Makefile.am6
-rw-r--r--configure.ac9
3 files changed, 12 insertions, 98 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e1a5979..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,95 +0,0 @@
-2006-09-03 Philip langdale <plangdale@vmware.com>
-
- * src/vmware.c:
- * src/vmware.h:
- * src/vmwarectrl.c:
- Fix https://bugs.freedesktop.org/show_bug.cgi?id=8094
- Lazily allocate the dynamic modes used for pixel precise guest
- resizing. They will not appear until they are neeed.
-
-2006-04-07 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- * src/vmware.c:
- * src/vmware.h:
- Unlibcwrap. Bump server version requirement. Bump to 10.13.0.
-
-2006-02-06 Philip Langdale <plangdale@vmware.com>
-
- * configure.ac: Bump version number.
- * src/vmware.c
- * src/vmware.h: (VMWAREScreenInit) Set up the additional
- state required by the VMWARE_CTRL extension.
- A src/vmwarectrl.c
- A src/vmwarectrl.h
- A src/vmwarectrlproto.h: Add implementation of the VMWARE_CTRL
- extension.
-
- This change adds the VMWARE_CTRL extension which allows for
- an X client to request an arbitrary resolution be made
- available in the modeline list. The intent here is not to
- replace XF86VidMode (which, if it would only work, would have
- made VMWARE_CTRL unnecessary) so we are not providing an
- Add/Remove functionality. Rather, a single command "SetRes"
- is provided. This will update one of two special entries in
- the modeline list with the requested resolution (assuming
- it's possible given the fixed framebuffer restriction).
- The client can then use RandR to find and switch to the
- requested resolution. We need two entries because the
- server gets confused when asked to switch to a new
- mode that has the same position in the list as the old
- mode.
-
- vmwarectrl.h and vmwarectrlproto.h follow the standard
- pattern for extension headers and can be dropped into any
- client side project that wishes to call the extension -
- although it is probably of very limited use to non-VMware
- clients.
-
-2006-01-12 Philip Langdale <plangdale@vmware.com>
-
- * configure.ac: Bump version number.
- * src/vmware.c: Implement the DriverFunc so that we
- can adjust the guest 'physical' display size to keep
- DPI constant. Setting the initial display size to
- match the host continues to be an exercise for the user.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for final X11R7 release candidate.
-
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC3 release.
-
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
-
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Only build dlloader modules by default.
-
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version number for X11R7 RC2 release.
-
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
diff --git a/Makefile.am b/Makefile.am
index 7052905..ac9caf7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,9 @@
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+.PHONY: ChangeLog
+
+ChangeLog:
+ $(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index b4e6a17..59b2a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
@@ -94,9 +100,6 @@ AC_SUBST([moduledir])
DRIVER_NAME=vmware
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-
AC_OUTPUT([
Makefile
src/Makefile