author | X gate hg captive account <xhg@xserver.us.oracle.com> |
Wed, 19 Aug 2015 13:48:41 -0700 | |
changeset 1484 | bc8922b8e1d2 |
parent 1370 | 7a7a374453e5 |
permissions | -rw-r--r-- |
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
1 |
diff --git a/Makefile.am b/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
2 |
index 6c1a81c..9ca5088 100644 |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
3 |
--- a/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
4 |
+++ b/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
5 |
@@ -20,21 +20,16 @@ |
469
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
6 |
# PERFORMANCE OF THIS SOFTWARE. |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
7 |
|
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
8 |
SUBDIRS = man |
469
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
9 |
-bin_PROGRAMS = xmag |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
10 |
+bin_PROGRAMS = xmag_multivis |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
11 |
|
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
12 |
AM_CFLAGS = $(XMAG_CFLAGS) $(CWARNFLAGS) |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
13 |
-xmag_LDADD = $(XMAG_LIBS) |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
14 |
- |
469
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
15 |
-xmag_SOURCES = \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
16 |
- CutPaste.c \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
17 |
- CutPaste.h \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
18 |
- RootWin.c \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
19 |
- RootWin.h \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
20 |
- RootWinP.h \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
21 |
- Scale.c \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
22 |
- Scale.h \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
23 |
- ScaleP.h \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
24 |
- xmag.c |
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
25 |
+AM_CFLAGS += -DSHAPE -DALLPLANES |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
26 |
+xmag_multivis_LDADD = -lXext -lX11 |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
27 |
+ |
469
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
28 |
+xmag_multivis_SOURCES = \ |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
29 |
+ xmag_multivis.c \ |
1068
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
493
diff
changeset
|
30 |
+ multivis.c \ |
0dc26c96a5af
7010624 X11R7.6 Update: Application, Utility, & Data modules [PSARC/2011/033]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
493
diff
changeset
|
31 |
+ multivis.h |
469
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
32 |
|
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
33 |
# App default files (*.ad) |
18722b3626c4
6726838 move xmag_multivis to open-src/app
Niveditha Rau <Niveditha.Rau@Sun.COM>
parents:
diff
changeset
|
34 |
|
1370
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
35 |
diff --git a/man/Makefile.am b/man/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
36 |
index 2b87098..cc1c8f2 100644 |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
37 |
--- a/man/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
38 |
+++ b/man/Makefile.am |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
39 |
@@ -1,6 +1,6 @@ |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
40 |
|
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
41 |
appmandir = $(APP_MAN_DIR) |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
42 |
-appman_PRE = xmag.man |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
43 |
+appman_PRE = xmag_multivis.man |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
44 |
appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) |
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
45 |
|
7a7a374453e5
17472475 Mass minor bugfix update to X.Org upstream release [Sep. 2013 edition]
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
1196
diff
changeset
|
46 |
EXTRA_DIST = $(appman_PRE) |