1 [Patches adjusted from originals in git to match current state of tree.] |
|
2 |
|
3 commit 8deaaa312ad7f9b492a2ae8ad17d74650112c25c |
|
4 Author: Bernhard Rosenkraenzer <[email protected]> |
|
5 Date: Sat Nov 4 18:59:39 2006 +0200 |
|
6 |
|
7 automake: avoid use of reserved _SOURCES keyword (bug #8866) |
|
8 Avoid using _SOURCES unless we're directly referencing a program or |
|
9 library to be built; use _SRCS instead. Shuts automake 1.10 up. |
|
10 |
|
11 diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am |
|
12 index 9e09fb6..caf6007 100644 |
|
13 --- a/hw/xfree86/os-support/linux/Makefile.am |
|
14 +++ b/hw/xfree86/os-support/linux/Makefile.am |
|
15 @@ -12,12 +12,12 @@ PLATFORM_PCI_SUPPORT = lnx_ev56.c \ |
|
16 endif |
|
17 |
|
18 if LNXACPI |
|
19 -ACPI_SOURCES = lnx_acpi.c lnx_apm.c |
|
20 +ACPI_SRCS = lnx_acpi.c lnx_apm.c |
|
21 XORG_CFLAGS += -DHAVE_ACPI |
|
22 endif |
|
23 |
|
24 if LNXAPM |
|
25 -APM_SOURCES = lnx_apm.c |
|
26 +APM_SRCS = lnx_apm.c |
|
27 XORG_CFLAGS += -DHAVE_APM |
|
28 endif |
|
29 |
|
30 @@ -32,8 +32,8 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid |
|
31 $(srcdir)/../shared/stdResource.c \ |
|
32 $(srcdir)/../shared/libc_wrapper.c \ |
|
33 $(srcdir)/../shared/at_scancode.c \ |
|
34 - $(ACPI_SOURCES) \ |
|
35 - $(APM_SOURCES) \ |
|
36 + $(ACPI_SRCS) \ |
|
37 + $(APM_SRCS) \ |
|
38 $(PLATFORM_PCI_SUPPORT) |
|
39 |
|
40 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) |
|
41 @@ -41,13 +41,13 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC |
|
42 INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack |
|
43 |
|
44 # FIXME: These need to be added to the build |
|
45 -LNX_EXTRA_SOURCES = \ |
|
46 +LNX_EXTRA_SRCS = \ |
|
47 lnx_font.c \ |
|
48 lnx_jstk.c \ |
|
49 lnxResource.c |
|
50 |
|
51 EXTRA_DIST = \ |
|
52 - $(LNX_EXTRA_SOURCES) \ |
|
53 + $(LNX_EXTRA_SRCS) \ |
|
54 lnx.h \ |
|
55 lnx_kbd.h \ |
|
56 $(srcdir)/../shared/xf86Axp.h \ |
|
57 diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am |
|
58 index f546e1a..8bec350 100644 |
|
59 --- a/hw/xfree86/os-support/misc/Makefile.am |
|
60 +++ b/hw/xfree86/os-support/misc/Makefile.am |
|
61 @@ -1,18 +1,18 @@ |
|
62 # FIXME: Add the *.S files to build when applicable |
|
63 -I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S |
|
64 -OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c |
|
65 +I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S |
|
66 +OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c |
|
67 |
|
68 -ARCH_SOURCES = $(OTHER_SOURCES) |
|
69 +ARCH_SRCS = $(OTHER_SRCS) |
|
70 |
|
71 # FIXME: Add to the build (NeedPortIO) |
|
72 -PORTIO_SOURCES = PortIO.S |
|
73 +PORTIO_SRCS = PortIO.S |
|
74 |
|
75 # FIXME: Add to the build (if HasGcc || HasGcc2) |
|
76 -ILHACK_SOURCES = xf86_IlHack.c |
|
77 +ILHACK_SRCS = xf86_IlHack.c |
|
78 |
|
79 noinst_LTLIBRARIES = libmisc.la |
|
80 |
|
81 -libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) |
|
82 +libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS) |
|
83 |
|
84 #AM_LDFLAGS = -r |
|
85 |
|
86 @@ -20,4 +20,4 @@ INCLUDES = $(XORG_INCS) |
|
87 |
|
88 AM_CFLAGS = $(XORG_CFLAGS) |
|
89 |
|
90 -EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) |
|
91 +EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS) |
|
92 diff --git a/os/Makefile.am b/os/Makefile.am |
|
93 index dcfe80a..7381797 100644 |
|
94 --- a/os/Makefile.am |
|
95 +++ b/os/Makefile.am |
|
96 @@ -3,14 +3,14 @@ noinst_LTLIBRARIES = libos.la libcwrappe |
|
97 AM_CFLAGS = $(DIX_CFLAGS) |
|
98 |
|
99 # FIXME: Add support for these in configure.ac |
|
100 -K5AUTH_SOURCES = k5auth.c |
|
101 -SECURERPC_SOURCES = rpcauth.c |
|
102 -INTERNALMALLOC_SOURCES = xalloc.c |
|
103 +K5AUTH_SRCS = k5auth.c |
|
104 +SECURERPC_SRCS = rpcauth.c |
|
105 +INTERNALMALLOC_SRCS = xalloc.c |
|
106 |
|
107 -XCSECURITY_SOURCES = secauth.c |
|
108 -XDMCP_SOURCES = xdmcp.c |
|
109 -STRLCAT_SOURCES = strlcat.c strlcpy.c |
|
110 -XORG_SOURCES = log.c |
|
111 +XCSECURITY_SRCS = secauth.c |
|
112 +XDMCP_SRCS = xdmcp.c |
|
113 +STRLCAT_SRCS = strlcat.c strlcpy.c |
|
114 +XORG_SRCS = log.c |
|
115 |
|
116 libos_la_SOURCES = \ |
|
117 WaitFor.c \ |
|
118 @@ -27,18 +27,18 @@ libos_la_SOURCES = \ |
|
119 xdmauth.c \ |
|
120 xstrans.c \ |
|
121 xprintf.c \ |
|
122 - $(XORG_SOURCES) |
|
123 + $(XORG_SRCS) |
|
124 |
|
125 if XCSECURITY |
|
126 -libos_la_SOURCES += $(XCSECURITY_SOURCES) |
|
127 +libos_la_SOURCES += $(XCSECURITY_SRCS) |
|
128 endif |
|
129 |
|
130 if XDMCP |
|
131 -libos_la_SOURCES += $(XDMCP_SOURCES) |
|
132 +libos_la_SOURCES += $(XDMCP_SRCS) |
|
133 endif |
|
134 |
|
135 if NEED_STRLCAT |
|
136 -libos_la_SOURCES += $(STRLCAT_SOURCES) |
|
137 +libos_la_SOURCES += $(STRLCAT_SRCS) |
|
138 endif |
|
139 |
|
140 libcwrapper_la_SOURCES = \ |
|
141 @@ -48,8 +48,8 @@ libcwrapper_la_CFLAGS = \ |
|
142 -I$(top_srcdir)/hw/xfree86/os-support \ |
|
143 $(AM_CFLAGS) |
|
144 |
|
145 -EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \ |
|
146 - $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(STRLCAT_SOURCES) |
|
147 +EXTRA_DIST = $(K5AUTH_SRCS) $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \ |
|
148 + $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS) |
|
149 |
|
150 if XSERVER_DTRACE |
|
151 # Generate dtrace object code for probes in libos |
|
152 |
|
153 |
|
154 |
|
155 |
|
156 commit 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11 |
|
157 Author: Alan Coopersmith <[email protected]> |
|
158 Date: Thu Jul 12 13:00:32 2007 -0700 |
|
159 |
|
160 Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10 |
|
161 |
|
162 diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am |
|
163 index 50aa673..cef6b5b 100644 |
|
164 --- a/hw/xfree86/Makefile.am |
|
165 +++ b/hw/xfree86/Makefile.am |
|
166 @@ -69,10 +69,10 @@ if SOLARIS_ASM_INLINE |
|
167 # Needs to be built before any files are compiled when using Sun compilers |
|
168 # so in*/out* inline definitions are properly processed. |
|
169 |
|
170 -BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il |
|
171 +BUILT_SOURCES += os-support/solaris/solaris-@[email protected] |
|
172 |
|
173 -os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il: |
|
174 - cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il |
|
175 +os-support/solaris/solaris-@[email protected]: |
|
176 + cd os-support/solaris ; make solaris-@[email protected] |
|
177 endif |
|
178 |
|
179 # do not use $(mkdir_p) if you want automake 1.7 to work |
|
180 diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am |
|
181 index d01e2e6..c027d9a 100644 |
|
182 --- a/hw/xfree86/os-support/solaris/Makefile.am |
|
183 +++ b/hw/xfree86/os-support/solaris/Makefile.am |
|
184 @@ -15,11 +15,11 @@ #else |
|
185 #AGP_SRC = $(srcdir)/../shared/agp_noop.c |
|
186 #endif |
|
187 |
|
188 -SOLARIS_INOUT_SRC = solaris-$(SOLARIS_INOUT_ARCH).S |
|
189 -DISTCLEANFILES = solaris-$(SOLARIS_INOUT_ARCH).il |
|
190 +SOLARIS_INOUT_SRC = solaris-@[email protected] |
|
191 +DISTCLEANFILES = solaris-@[email protected] |
|
192 |
|
193 -solaris-$(SOLARIS_INOUT_ARCH).il: solaris-${SOLARIS_INOUT_ARCH}.S |
|
194 - $(CPP) -P -DINLINE_ASM solaris-${SOLARIS_INOUT_ARCH}.S > $@ |
|
195 +solaris-@[email protected]: solaris-@[email protected] |
|
196 + $(CPP) -P -DINLINE_ASM solaris-@[email protected] > $@ |
|
197 |
|
198 noinst_LTLIBRARIES = libsolaris.la |
|
199 libsolaris_la_SOURCES = sun_bios.c sun_init.c $(IO_SRC) $(KBD_SRCS) \ |
|
200 @@ -32,7 +32,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_i |
|
201 nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) |
|
202 |
|
203 sdk_HEADERS = agpgart.h |
|
204 -nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il |
|
205 +nodist_sdk_HEADERS = solaris-@[email protected] |
|
206 |
|
207 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) |
|
208 |
|