[v2 3/6] xfree86/linux: cleanup Makefile.am
Peter Hutterer
peter.hutterer at who-t.net
Tue Dec 17 17:48:59 PST 2013
On Tue, Dec 17, 2013 at 11:35:56PM +0100, Daniel Martin wrote:
> Remove $(srcdir), indent source filenames with one tab and sort them.
>
> Signed-off-by: Daniel Martin <consume.noise at gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Cheers,
Peter
> ---
> v2: Walter H. asked for a shortcut for $(srcdir)/../shared/. And this
> was shorted form that works here. ;)
>
> hw/xfree86/os-support/linux/Makefile.am | 31 ++++++++++++++++++-------------
> 1 file changed, 18 insertions(+), 13 deletions(-)
>
> diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
> index 83e7e00..746c340 100644
> --- a/hw/xfree86/os-support/linux/Makefile.am
> +++ b/hw/xfree86/os-support/linux/Makefile.am
> @@ -3,8 +3,8 @@ noinst_LTLIBRARIES = liblinux.la
> if LINUX_ALPHA
> noinst_LTLIBRARIES += liblinuxev56.la
> PLATFORM_PCI_SUPPORT = \
> - $(srcdir)/lnx_axp.c \
> - $(srcdir)/../shared/xf86Axp.c
> + ../shared/xf86Axp.c \
> + lnx_axp.c
>
> liblinuxev56_la_CFLAGS = $(AM_CFLAGS) -mcpu=ev56
>
> @@ -21,23 +21,28 @@ APM_SRCS = lnx_apm.c
> XORG_CFLAGS += -DHAVE_APM
> endif
>
> -liblinux_la_SOURCES = lnx_init.c lnx_video.c \
> - lnx_agp.c lnx_kmod.c lnx_bell.c lnx_platform.c \
> - $(srcdir)/../shared/bios_mmap.c \
> - $(srcdir)/../shared/VTsw_usl.c \
> - $(srcdir)/../shared/posix_tty.c \
> - $(srcdir)/../shared/vidmem.c \
> - $(srcdir)/../shared/sigio.c \
> - $(ACPI_SRCS) \
> - $(APM_SRCS) \
> - $(PLATFORM_PCI_SUPPORT)
> +liblinux_la_SOURCES = \
> + ../shared/VTsw_usl.c \
> + ../shared/bios_mmap.c \
> + ../shared/posix_tty.c \
> + ../shared/sigio.c \
> + ../shared/vidmem.c \
> + $(ACPI_SRCS) \
> + $(APM_SRCS) \
> + $(PLATFORM_PCI_SUPPORT) \
> + lnx_agp.c \
> + lnx_bell.c \
> + lnx_init.c \
> + lnx_kmod.c \
> + lnx_platform.c \
> + lnx_video.c
>
> AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
>
> AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
>
> EXTRA_DIST = \
> - $(srcdir)/../shared/xf86Axp.h
> + ../shared/xf86Axp.h
>
> if LINUX_ALPHA
> liblinux_la_LIBADD = liblinuxev56.la
> --
> 1.8.5.1
>
More information about the xorg-devel
mailing list