diff options
| -rw-r--r-- | hw/xfree86/os-support/linux/Makefile.am | 12 | ||||
| -rw-r--r-- | hw/xfree86/os-support/misc/Makefile.am | 14 | ||||
| -rw-r--r-- | os/Makefile.am | 26 |
3 files changed, 26 insertions, 26 deletions
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index 9e09fb610..caf600787 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -12,12 +12,12 @@ PLATFORM_PCI_SUPPORT = lnx_ev56.c \ endif if LNXACPI -ACPI_SOURCES = lnx_acpi.c lnx_apm.c +ACPI_SRCS = lnx_acpi.c lnx_apm.c XORG_CFLAGS += -DHAVE_ACPI endif if LNXAPM -APM_SOURCES = lnx_apm.c +APM_SRCS = lnx_apm.c XORG_CFLAGS += -DHAVE_APM endif @@ -30,8 +30,8 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_mouse.c \ $(srcdir)/../shared/sigio.c \ $(srcdir)/../shared/stdResource.c \ $(srcdir)/../shared/libc_wrapper.c \ - $(ACPI_SOURCES) \ - $(APM_SOURCES) \ + $(ACPI_SRCS) \ + $(APM_SRCS) \ $(PLATFORM_PCI_SUPPORT) AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) @@ -39,12 +39,12 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack # FIXME: These need to be added to the build -LNX_EXTRA_SOURCES = \ +LNX_EXTRA_SRCS = \ lnx_font.c \ lnx_jstk.c \ lnxResource.c EXTRA_DIST = \ - $(LNX_EXTRA_SOURCES) \ + $(LNX_EXTRA_SRCS) \ lnx.h \ $(srcdir)/../shared/xf86Axp.h diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index f546e1a92..8bec35088 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -1,18 +1,18 @@ # FIXME: Add the *.S files to build when applicable -I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S -OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c +I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S +OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c -ARCH_SOURCES = $(OTHER_SOURCES) +ARCH_SRCS = $(OTHER_SRCS) # FIXME: Add to the build (NeedPortIO) -PORTIO_SOURCES = PortIO.S +PORTIO_SRCS = PortIO.S # FIXME: Add to the build (if HasGcc || HasGcc2) -ILHACK_SOURCES = xf86_IlHack.c +ILHACK_SRCS = xf86_IlHack.c noinst_LTLIBRARIES = libmisc.la -libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) +libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS) #AM_LDFLAGS = -r @@ -20,4 +20,4 @@ INCLUDES = $(XORG_INCS) AM_CFLAGS = $(XORG_CFLAGS) -EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) +EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS) diff --git a/os/Makefile.am b/os/Makefile.am index dcfe80ac3..7381797ab 100644 --- a/os/Makefile.am +++ b/os/Makefile.am @@ -3,14 +3,14 @@ noinst_LTLIBRARIES = libos.la libcwrapper.la AM_CFLAGS = $(DIX_CFLAGS) # FIXME: Add support for these in configure.ac -K5AUTH_SOURCES = k5auth.c -SECURERPC_SOURCES = rpcauth.c -INTERNALMALLOC_SOURCES = xalloc.c +K5AUTH_SRCS = k5auth.c +SECURERPC_SRCS = rpcauth.c +INTERNALMALLOC_SRCS = xalloc.c -XCSECURITY_SOURCES = secauth.c -XDMCP_SOURCES = xdmcp.c -STRLCAT_SOURCES = strlcat.c strlcpy.c -XORG_SOURCES = log.c +XCSECURITY_SRCS = secauth.c +XDMCP_SRCS = xdmcp.c +STRLCAT_SRCS = strlcat.c strlcpy.c +XORG_SRCS = log.c libos_la_SOURCES = \ WaitFor.c \ @@ -27,18 +27,18 @@ libos_la_SOURCES = \ xdmauth.c \ xstrans.c \ xprintf.c \ - $(XORG_SOURCES) + $(XORG_SRCS) if XCSECURITY -libos_la_SOURCES += $(XCSECURITY_SOURCES) +libos_la_SOURCES += $(XCSECURITY_SRCS) endif if XDMCP -libos_la_SOURCES += $(XDMCP_SOURCES) +libos_la_SOURCES += $(XDMCP_SRCS) endif if NEED_STRLCAT -libos_la_SOURCES += $(STRLCAT_SOURCES) +libos_la_SOURCES += $(STRLCAT_SRCS) endif libcwrapper_la_SOURCES = \ @@ -48,8 +48,8 @@ libcwrapper_la_CFLAGS = \ -I$(top_srcdir)/hw/xfree86/os-support \ $(AM_CFLAGS) -EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \ - $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(LBX_SOURCES) $(STRLCAT_SOURCES) +EXTRA_DIST = $(K5AUTH_SRCS) $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ + $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS) if XSERVER_DTRACE # Generate dtrace object code for probes in libos & libdix |