Re: [PATCH xinput 1/2] man: update missing copyrights
Peter Hutterer peter.hutte...@who-t.net (06/07/2011): Signed-off-by: Peter Hutterer peter.hutte...@who-t.net Reviewed-by: Cyril Brulebois k...@debian.org for both. Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH v2 xkbcomp] Add .pc file for version export
On Wed, 2011-07-06 at 09:35 +1000, Peter Hutterer wrote: Exports xkbcomp version and the xkb base directory. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- Changes to v1: - use libdir, not datadir - export Requires.private as well Makefile.am |3 +++ configure.ac |8 ++-- xkbcomp.pc.in |9 + 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 xkbcomp.pc.in diff --git a/Makefile.am b/Makefile.am index d0e991d..01632f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,9 @@ xkbcomp_SOURCES = \ xkbpath.h \ xkbscan.c +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xkbcomp.pc + MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 252eb1a..9c400b6 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,11 @@ fi AC_CHECK_FUNCS([strdup strcasecmp]) +REQUIRED_MODULES=x11 xkbfile + # Checks for pkg-config packages -PKG_CHECK_MODULES(XKBCOMP, x11 xkbfile) +PKG_CHECK_MODULES(XKBCOMP, [$REQUIRED_MODULES]) +AC_SUBST(REQUIRED_MODULES) AC_ARG_WITH([xkb_config_root], [AS_HELP_STRING([--with-xkb-config-root=paths], @@ -58,5 +61,6 @@ AC_SUBST([XKBCONFIGROOT]) AC_CONFIG_FILES([ Makefile - man/Makefile]) + man/Makefile + xkbcomp.pc]) AC_OUTPUT diff --git a/xkbcomp.pc.in b/xkbcomp.pc.in new file mode 100644 index 000..b8d6023 --- /dev/null +++ b/xkbcomp.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +datarootdir=@datarootdir@ +datadir=@datadir@ +xkbconfigdir=@XKBCONFIGROOT@ + +Name: xkbcomp +Description: XKB keymap compiler +Version: @PACKAGE_VERSION@ +Requires.private: @REQUIRED_MODULES@ Reviewed-by: Gaetan Nadon mems...@videotron.ca signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH v2 synaptics 0/7] Revert build: collapse all Makefile.am files into a single non-recursive one
On Wed, 2011-07-06 at 15:56 +1000, Peter Hutterer wrote: On Thu, Jun 30, 2011 at 01:01:54PM -0400, Gaetan Nadon wrote: Version 2 adds patches 6 and 7 to implement distcheck support for non-writable dirs. These may be pushed after 1.5. As I reverted this patch and found new issues, I ended up reverting 5 patches. Solving conflicts is always risky, and some reversal were not bisectable. I realized I could just revert the patches in the opposite direction and have no conflicts at all. The order of the reversal does not reflect the order in which problems have been found. I would not recommend trying to modify some of the patches if a fix seems apparent. I'd rather reviewers accept/reject this series as a unit of work. Any desirable feature to be retained would be safer done/reviewed separatly. Distcheck passes with each patch. None of them in between pacthes were related to autotool or makefile. This seems the safest approach as 1.5 waiting around the corner. urgh, I'm not sure which version goes where now. I've had some of your patches merged already. Can you push your branch (with my include removal patch) somewhere and I'll just pull it in? That'd make it easier than applying them one by one. Yes, that's better. Having your patch in will allow me to finish the work. I'll be out for a couple of days however. Thanks Cheers, Peter Gaetan Nadon (7): Revert build: apply the distcheck tricks used in xf86-input-evdev Revert build: create object files following the sources' structure. Revert build: install documentation as part of make install. Revert build: collapse all Makefile.am files into a single non-recursive one. Revert build: sort building of tools, ensure that cross-pkg-config works. Add distcheck support for header files when sdk is not writable Add distcheck support for configuration files when dir is not writable .gitignore |4 -- Makefile.am | 104 ++ conf/Makefile.am| 27 + configure.ac| 15 ++- include/Makefile.am | 21 ++ man/Makefile.am | 47 +++ src/Makefile.am | 52 + test/.gitignore |6 +++ test/Makefile.am| 15 +++ tools/.gitignore|3 + tools/Makefile.am | 31 +++ 11 files changed, 220 insertions(+), 105 deletions(-) create mode 100644 conf/Makefile.am create mode 100644 include/Makefile.am create mode 100644 man/Makefile.am create mode 100644 src/Makefile.am create mode 100644 test/.gitignore create mode 100644 test/Makefile.am create mode 100644 tools/.gitignore create mode 100644 tools/Makefile.am -- 1.7.4.1 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:x11perf] Let autoconf generate x11perfcomp directly instead of doing it via sed
On Fri, 2011-07-01 at 19:53 -0700, Alan Coopersmith wrote:
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
---
Makefile.am |6 --
configure.ac |1 +
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5cfedb4..bb381d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,12 +48,6 @@ x11perf_SOURCES = \
x11perf.h
bin_SCRIPTS = x11perfcomp
-CLEANFILES = $(bin_SCRIPTS)
-EXTRA_DIST = $(bin_SCRIPTS:=.in)
-DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'
This is actually the preferred method for variables based on prefix and
a recommendation from Automake.
config.status: S[x11perfcompdir]=${exec_prefix}/lib/X11/x11perfcomp
The variable ${exec_prefix} is not defined in the script.
I have submitted a similar patches in the past and a reviewer was kind
enough to point it out. I had included $exec_prefix and $prefix but we
get into a cascading variable definitions.
-
-x11perfcomp: x11perfcomp.in
- $(AM_V_GEN)$(SED) $(DIR_SUBSTS) $(srcdir)/$@.in $@
dist_x11perfcomp_SCRIPTS = \
fillblnk\
diff --git a/configure.ac b/configure.ac
index d23c209..0e5c297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,7 @@ yes)
esac
AC_CONFIG_FILES([
+ x11perfcomp
Makefile
man/Makefile])
AC_OUTPUT
signature.asc
Description: This is a digitally signed message part
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH xinput 2/2] man: Move my name to the top of the authors list
On Wed, 2011-07-06 at 08:55 +1000, Peter Hutterer wrote: It's reasonably likely that someone looking at the list of authors will email the first one on the list. Let that be the current maintainer, it's more likely that there will be the desired response. Signed-off-by: Peter Hutterer peter.hutte...@who-t.net --- man/xinput.man |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/man/xinput.man b/man/xinput.man index f051400..8a348d1 100644 --- a/man/xinput.man +++ b/man/xinput.man @@ -164,9 +164,9 @@ Copyright 2009-2011, Red Hat, Inc. .SH AUTHORS .nf +Peter Hutterer peter.hutte...@who-t.net Philip Langdale, phil...@alumni.utexas.net Frederic Lepied, France frederic.lep...@sugix.frmug.org -Peter Hutterer peter.hutte...@who-t.net Julien Cristau jcris...@debian.org Thomas Jaeger thjae...@gmail.com and more. Reviewed-by: Gaetan Nadon mems...@videotron.ca signature.asc Description: This is a digitally signed message part ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:x11perf] Let autoconf generate x11perfcomp directly instead of doing it via sed
On 07/ 6/11 06:10 PM, Gaetan Nadon wrote:
On Fri, 2011-07-01 at 19:53 -0700, Alan Coopersmith wrote:
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
mailto:alan.coopersm...@oracle.com
---
Makefile.am |6 --
configure.ac |1 +
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 5cfedb4..bb381d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,12 +48,6 @@ x11perf_SOURCES = \
x11perf.h
bin_SCRIPTS = x11perfcomp
-CLEANFILES = $(bin_SCRIPTS)
-EXTRA_DIST = $(bin_SCRIPTS:=.in)
-DIR_SUBSTS = -e 's|@x11perfcompdir[@]|$(x11perfcompdir)|g'
This is actually the preferred method for variables based on prefix and a
recommendation from Automake.
Sorry, which is this? The way it was or the way I made it?
I pushed this patch today since I hadn't gotten feedback, but it's easy to
push a revert or better fix.
config.status: S[x11perfcompdir]=${exec_prefix}/lib/X11/x11perfcomp
The variable ${exec_prefix} is not defined in the script.
I have submitted a similar patches in the past and a reviewer was kind enough
to
point it out. I had included $exec_prefix and $prefix but we get into a
cascading variable definitions.
Ah yes, I guess it does leave it as:
PATH=${exec_prefix}/lib/X11/x11perfcomp:[...] in the output script - guess
I missed that before.
So I guess I should revert this out.
--
-Alan Coopersmith-alan.coopersm...@oracle.com
Oracle Solaris Platform Engineering: X Window System
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
