[PATCH 1/4]new driver initial patch

[Gaetan Nadon]

On 12-08-01 05:27 AM, Aaron.Chen 陈俊杰 wrote:
> Hi,
>
> From 0766145c2e2134325b45072e8e52b9bef7ff463b Mon Sep 17 00:00:00 2001
> From: Aaron Chen <aaron.chen at siliconmotion.com>
> Date: Wed, 1 Aug 2012 16:26:24 +0800
> Subject: [PATCH 1/4] new driver initial patch 1
>
> modified man folder, which is suitable for the new driver.
>
> Signed-off-by: Aaron.Chen <aaron.chen at siliconmotion.com>
> ---
>  man/Makefile.am |   21 ++++++++++++++++++---
>  1 files changed, 18 insertions(+), 3 deletions(-)
>
> diff --git a/man/Makefile.am b/man/Makefile.am
> index e1182ee..c6c85ab 100644
> --- a/man/Makefile.am
> +++ b/man/Makefile.am
> @@ -31,10 +31,25 @@ EXTRA_DIST = @DRIVER_NAME at .man
>
>  CLEANFILES = $(driverman_DATA)
>
> -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
> -
> +SED = sed
> +
> +# Strings to replace in man pages
> +XORGRELSTRING = @PACKAGE_STRING@
> +  XORGMANNAME = X Version 11
> +
> +MAN_SUBSTS = \
> +       -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
> +       -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
> +       -e 's|__xservername__|Xorg|g' \
> +       -e 's|__xconfigfile__|xorg.conf|g' \
> +       -e 's|__projectroot__|$(prefix)|g' \
> +       -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
> +       -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
> +       -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
> +       -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
> +       -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
>
>  SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
>
>  .man.$(DRIVER_MAN_SUFFIX):
> -       $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
> +       sed $(MAN_SUBSTS) < $< > $@
>
>
Nak. You are throwing out 2 years of maintenance. The existing (more
up-to-date) makefile should work. You can type "make install" in the man
directory and test the resultant man page even if the rest of the driver
does not build. That's the reason for the man page being in a separate
directory, so it does not get accidentally broken by changes for other
parts of the driver.

Be careful when doing a wholesale replacement. You can be throwing out
lots of valid code changes. The fact that it may appear to be working in
the short does not justify the method. There is no way around it, you
need to do a code merge.
http://en.wikipedia.org/wiki/Merge_%28revision_control%29.


> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20120806/467d48d1/attachment.html>