author | X gate hg captive account <xhg@xserver.us.oracle.com> |
Wed, 19 Aug 2015 13:48:41 -0700 | |
changeset 1484 | bc8922b8e1d2 |
parent 1422 | e9cadc0026d8 |
permissions | -rw-r--r-- |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
1 |
############################################################################### |
1422
e9cadc0026d8
19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1276
diff
changeset
|
2 |
# Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved. |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
3 |
# |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
4 |
# Permission is hereby granted, free of charge, to any person obtaining a |
919
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
5 |
# copy of this software and associated documentation files (the "Software"), |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
6 |
# to deal in the Software without restriction, including without limitation |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
7 |
# the rights to use, copy, modify, merge, publish, distribute, sublicense, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
8 |
# and/or sell copies of the Software, and to permit persons to whom the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
9 |
# Software is furnished to do so, subject to the following conditions: |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
10 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
11 |
# The above copyright notice and this permission notice (including the next |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
12 |
# paragraph) shall be included in all copies or substantial portions of the |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
13 |
# Software. |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
14 |
# |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
15 |
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
16 |
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
17 |
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
18 |
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
19 |
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
20 |
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
425233ae7236
6931307 Standardize Sun copyright & license notices in X gate on current format
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
354
diff
changeset
|
21 |
# DEALINGS IN THE SOFTWARE. |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
22 |
# |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
23 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
24 |
diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am |
1072
88d1d779286d
7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
25 |
--- src/Makefile.am 2009-10-16 14:26:51.000000000 -0700 |
88d1d779286d
7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
26 |
+++ src/Makefile.am 2011-02-11 16:42:34.881458929 -0800 |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
27 |
@@ -9,11 +9,13 @@ AM_CPPFLAGS = \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
28 |
|
1072
88d1d779286d
7010623 X11R7.6 Update: Library modules
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
943
diff
changeset
|
29 |
AM_CFLAGS = $(CWARNFLAGS) $(XMU_CFLAGS) |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
30 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
31 |
-libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
32 |
-libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined |
1422
e9cadc0026d8
19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1276
diff
changeset
|
33 |
+libXmu_la_LDFLAGS = -version-number 4:0:0 -no-undefined -M ../../mapfile-Xmu |
e9cadc0026d8
19461700 Split source & build subdirectories in X builds
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1276
diff
changeset
|
34 |
+libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined -M ../../mapfile-Xmuu |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
35 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
36 |
-libXmu_la_LIBADD = $(XMU_LIBS) |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
37 |
-libXmuu_la_LIBADD = $(XMUU_LIBS) |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
38 |
+libXmu_la_DEPENDENCIES = libXmuu.so.1 |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
39 |
+ |
354
c5722f7db2ea
6671721 Update libXt to opensrc verion 1.0.5 from X.org [build fixes]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
282
diff
changeset
|
40 |
+libXmu_la_LIBADD = $(XMU_LIBS) libXmuu.so.1 -lX11 -lc -lm |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
41 |
+libXmuu_la_LIBADD = $(XMUU_LIBS) -lc |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
42 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
43 |
libXmuu_la_SOURCES = \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
44 |
ClientWin.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
45 |
@@ -23,7 +25,8 @@ libXmuu_la_SOURCES = \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
46 |
Lower.c |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
47 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
48 |
libXmu_la_SOURCES = \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
49 |
- $(libXmuu_la_SOURCES) \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
50 |
+ CmapEquiv.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
51 |
+ VisGamma.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
52 |
AllCmap.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
53 |
Atoms.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
54 |
Clip.c \ |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
55 |
@@ -79,7 +82,7 @@ lintlibdir = $(libdir) |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
56 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
57 |
lintlib_DATA = $(LINTLIB) $(LINTLIBUU) |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
58 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
59 |
-$(LINTLIB): $(libXmu_la_SOURCES) |
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
60 |
+$(LINTLIB): $(libXmu_la_SOURCES) $(libXmuu_la_SOURCES) |
1276
52f85727ce94
7161868 Update X.Org modules to X11R7.7 RC1
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1072
diff
changeset
|
61 |
$(LINT) -y -oXmu -x $(ALL_LINT_FLAGS) $(libXmu_la_SOURCES) |
278
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
62 |
|
d14c4ceeb35d
6651397 Xorg modularization: libXmu & libXmuu [PSARC 2008/036]
Alan Coopersmith <Alan.Coopersmith@Sun.COM>
parents:
diff
changeset
|
63 |
$(LINTLIBUU): $(libXmuu_la_SOURCES) |