]>
Commit | Line | Data |
---|---|---|
3a8c3542 JB |
1 | --- 3dwm-0.3.2/src/Nobel/Makefile.am.orig Sun Jun 10 15:56:25 2001 |
2 | +++ 3dwm-0.3.2/src/Nobel/Makefile.am Tue Jul 8 15:37:11 2003 | |
3 | @@ -91,7 +91,7 @@ | |
4 | lib_LTLIBRARIES = libNobel.la | |
5 | ||
6 | INCLUDES = -I$(top_builddir)/include/Nobel | |
7 | -CXXFLAGS = $(ORBCXXFLAGS) | |
8 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
9 | ||
10 | CLEANFILES = $(SRC) $(HDR) | |
11 | ||
12 | --- 3dwm-0.3.2/src/Celsius/SAX/Makefile.am.orig Tue Aug 21 16:43:03 2001 | |
13 | +++ 3dwm-0.3.2/src/Celsius/SAX/Makefile.am Tue Jul 8 15:35:24 2003 | |
14 | @@ -48,7 +48,7 @@ | |
15 | lib_LTLIBRARIES = libCelsiusSAX.la | |
16 | ||
17 | INCLUDES = -I$(top_srcdir)/include | |
18 | -CXXFLAGS = -Wall $(XML_LIBS_I) | |
19 | +CXXFLAGS = @CXXFLAGS@ -Wall $(XML_LIBS_I) | |
20 | ||
21 | libCelsiusSAX_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
22 | libCelsiusSAX_la_LIBADD = $(XML_LIBS_L) | |
23 | --- 3dwm-0.3.2/src/Celsius/Makefile.am.orig Fri Dec 7 14:09:36 2001 | |
24 | +++ 3dwm-0.3.2/src/Celsius/Makefile.am Tue Jul 8 15:36:51 2003 | |
25 | @@ -50,7 +50,7 @@ | |
26 | lib_LTLIBRARIES = libCelsius.la | |
27 | ||
28 | INCLUDES = -I$(top_srcdir)/include/Celsius | |
29 | -CXXFLAGS = -Wall | |
30 | +AM_CXXFLAGS = -Wall | |
31 | ||
32 | libCelsius_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
33 | libCelsius_la_LIBADD = -ldl | |
34 | --- 3dwm-0.3.2/src/Garbo/Makefile.am.orig Sat Jun 9 16:44:56 2001 | |
35 | +++ 3dwm-0.3.2/src/Garbo/Makefile.am Tue Jul 8 15:37:01 2003 | |
36 | @@ -49,7 +49,7 @@ | |
37 | ||
38 | INCLUDES = -I$(top_srcdir)/include/ -I$(top_builddir)/include/Nobel \ | |
39 | -I$(top_srcdir)/include/Garbo | |
40 | -CXXFLAGS = $(ORBCXXFLAGS) | |
41 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
42 | ||
43 | libGarbo_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
44 | libGarbo_la_SOURCES = VNCInterface.cc WSInterface.cc vncauth.c d3des.c | |
45 | --- 3dwm-0.3.2/src/Zorn/Makefile.am.orig Wed Jun 20 14:32:15 2001 | |
46 | +++ 3dwm-0.3.2/src/Zorn/Makefile.am Tue Jul 8 15:37:39 2003 | |
47 | @@ -49,7 +49,7 @@ | |
48 | ||
49 | INCLUDES = -I$(top_srcdir)/include/Zorn | |
50 | YFLAGS = -d | |
51 | -CXXFLAGS = -Wall | |
52 | +AM_CXXFLAGS = -Wall | |
53 | ||
54 | libZorn_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
55 | libZorn_la_LIBADD = @LEXLIB@ | |
56 | --- 3dwm-0.3.2/src/Solid/Makefile.am.orig Wed Aug 1 17:09:02 2001 | |
57 | +++ 3dwm-0.3.2/src/Solid/Makefile.am Tue Jul 8 15:37:28 2003 | |
58 | @@ -48,7 +48,7 @@ | |
59 | lib_LTLIBRARIES = libSolid.la | |
60 | ||
61 | INCLUDES = -I$(top_srcdir)/include | |
62 | -CXXFLAGS = -Wall | |
63 | +AM_CXXFLAGS = -Wall | |
64 | ||
65 | libSolid_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
66 | libSolid_la_SOURCES = BSP.cc BSPTreeBuilder.cc BSPTree.cc \ | |
67 | --- 3dwm-0.3.2/src/support/Nobel++/Makefile.am.orig Sat Jun 9 16:44:57 2001 | |
68 | +++ 3dwm-0.3.2/src/support/Nobel++/Makefile.am Tue Jul 8 15:37:58 2003 | |
69 | @@ -49,7 +49,7 @@ | |
70 | ||
71 | INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/support \ | |
72 | -I$(top_builddir)/include/Nobel | |
73 | -CXXFLAGS = $(ORBCXXFLAGS) | |
74 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
75 | ||
76 | libNobelxx_la_LDFLAGS = -version-info $(LIBRARY_VERSION) | |
77 | libNobelxx_la_SOURCES = ImageLoader.cc Nobel.cc # VrmlLoader.cc | |
78 | --- 3dwm-0.3.2/server/Makefile.am.orig Tue Jul 8 15:31:58 2003 | |
79 | +++ 3dwm-0.3.2/server/Makefile.am Tue Jul 8 15:38:16 2003 | |
80 | @@ -33,7 +33,7 @@ | |
81 | # ------------------------------------------------------------------------ | |
82 | ||
83 | INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/Nobel -I/usr/X11R6/include | |
84 | -CXXFLAGS = $(ORBCXXFLAGS) | |
85 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
86 | ||
87 | bin_PROGRAMS = tdwm-server | |
88 | ||
89 | --- 3dwm-0.3.2/clients/texclient/Makefile.am.orig Tue May 29 00:45:23 2001 | |
90 | +++ 3dwm-0.3.2/clients/texclient/Makefile.am Tue Jul 8 15:39:24 2003 | |
91 | @@ -34,7 +34,7 @@ | |
92 | ||
93 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
94 | -I$(top_builddir)/include/Nobel | |
95 | -CXXFLAGS = $(ORBCXXFLAGS) | |
96 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
97 | ||
98 | bin_PROGRAMS = texclient | |
99 | ||
100 | --- 3dwm-0.3.2/clients/geoclient/Makefile.am.orig Sun Jun 10 15:56:25 2001 | |
101 | +++ 3dwm-0.3.2/clients/geoclient/Makefile.am Tue Jul 8 15:39:01 2003 | |
102 | @@ -34,7 +34,7 @@ | |
103 | ||
104 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
105 | -I$(top_builddir)/include/Nobel | |
106 | -CXXFLAGS = $(ORBCXXFLAGS) | |
107 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
108 | ||
109 | bin_PROGRAMS = geoclient | |
110 | ||
111 | --- 3dwm-0.3.2/clients/vncclient/Makefile.am.orig Tue Nov 13 16:18:07 2001 | |
112 | +++ 3dwm-0.3.2/clients/vncclient/Makefile.am Tue Jul 8 15:39:41 2003 | |
113 | @@ -34,7 +34,7 @@ | |
114 | ||
115 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
116 | -I$(top_builddir)/include/Nobel | |
117 | -CXXFLAGS = $(ORBCXXFLAGS) -Wall | |
118 | +AM_CXXFLAGS = $(ORBCXXFLAGS) -Wall | |
119 | ||
120 | bin_PROGRAMS = vncclient | |
121 | ||
122 | --- 3dwm-0.3.2/clients/pickclient/Makefile.am.orig Wed Jul 25 15:19:30 2001 | |
123 | +++ 3dwm-0.3.2/clients/pickclient/Makefile.am Tue Jul 8 15:39:13 2003 | |
124 | @@ -34,7 +34,7 @@ | |
125 | ||
126 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
127 | -I$(top_builddir)/include/Nobel | |
128 | -CXXFLAGS = $(ORBCXXFLAGS) | |
129 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
130 | ||
131 | bin_PROGRAMS = pickclient | |
132 | ||
133 | --- 3dwm-0.3.2/clients/csgclient/Makefile.am.orig Wed Jul 25 15:19:29 2001 | |
134 | +++ 3dwm-0.3.2/clients/csgclient/Makefile.am Tue Jul 8 15:38:53 2003 | |
135 | @@ -34,7 +34,7 @@ | |
136 | ||
137 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
138 | -I$(top_builddir)/include/Nobel | |
139 | -CXXFLAGS = $(ORBCXXFLAGS) | |
140 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
141 | ||
142 | bin_PROGRAMS = csgclient | |
143 | ||
144 | --- 3dwm-0.3.2/clients/clock/Makefile.am.orig Fri Dec 7 14:09:33 2001 | |
145 | +++ 3dwm-0.3.2/clients/clock/Makefile.am Tue Jul 8 15:38:43 2003 | |
146 | @@ -34,7 +34,7 @@ | |
147 | ||
148 | INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/include/support \ | |
149 | -I$(top_builddir)/include/Nobel | |
150 | -CXXFLAGS = $(ORBCXXFLAGS) | |
151 | +AM_CXXFLAGS = $(ORBCXXFLAGS) | |
152 | ||
153 | bin_PROGRAMS = tdwm-clock | |
154 |