1 |
haubi 11/05/26 09:20:03 |
2 |
|
3 |
Added: 001_all_nolibcheck.patch 002_all_gcc43.patch |
4 |
003_all_pthread.patch 004_all_aix.patch |
5 |
006_all_as-needed.patch 007_all_qt4-nothread.patch |
6 |
008_all_drop-pgsql-header-check.patch |
7 |
009_all_check-const-overload.patch |
8 |
010_all_preserve-cflags.patch |
9 |
011_all_gtk-check-stdlib.patch |
10 |
012_all_early-header-check.patch |
11 |
100_x86-winnt_parity.patch gtk-config |
12 |
Log: |
13 |
start with patches for 2.3.13 for live vcs build |
14 |
|
15 |
Revision Changes Path |
16 |
1.1 src/patchsets/mico/9999/001_all_nolibcheck.patch |
17 |
|
18 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch?rev=1.1&view=markup |
19 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/001_all_nolibcheck.patch?rev=1.1&content-type=text/plain |
20 |
|
21 |
Index: 001_all_nolibcheck.patch |
22 |
=================================================================== |
23 |
don't check for libbsd and libelf, they aren't needed anywhere. |
24 |
|
25 |
--- configure.in.orig 2009-02-02 14:34:14.000000000 +0100 |
26 |
+++ configure.in 2009-02-02 14:37:45.000000000 +0100 |
27 |
@@ -1237,9 +1237,7 @@ |
28 |
|
29 |
|
30 |
AC_CHECK_LIB(socket, open) |
31 |
-AC_CHECK_LIB(bsd, open) |
32 |
|
33 |
-AC_CHECK_LIB(elf, open) |
34 |
AC_CHECK_LIB(dl, open) |
35 |
AC_CHECK_LIB(dld, open) |
36 |
AC_CHECK_LIB(ld, open) |
37 |
|
38 |
|
39 |
|
40 |
1.1 src/patchsets/mico/9999/002_all_gcc43.patch |
41 |
|
42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/002_all_gcc43.patch?rev=1.1&view=markup |
43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/002_all_gcc43.patch?rev=1.1&content-type=text/plain |
44 |
|
45 |
Index: 002_all_gcc43.patch |
46 |
=================================================================== |
47 |
Patch to compile with gcc-4.3, thanks to Malcolm MacLeod <mmacleod@××××××××××.za> |
48 |
|
49 |
diff -ru mico.orig/include/mico/throw.h mico/include/mico/throw.h |
50 |
--- mico.orig/include/mico/throw.h 2008-07-25 15:41:44.000000000 +0200 |
51 |
+++ mico/include/mico/throw.h 2009-02-09 16:16:54.000000000 +0100 |
52 |
@@ -25,7 +25,7 @@ |
53 |
#define __mico_throw_h__ |
54 |
|
55 |
#include <stdarg.h> |
56 |
-#include <string.h> |
57 |
+#include <cstring> |
58 |
|
59 |
#ifdef HAVE_EXCEPTIONS |
60 |
#define MICO_CATCHANY(x) try { x; } catch (...) {} |
61 |
diff -ru mico.orig/orb/fast_array.cc mico/orb/fast_array.cc |
62 |
--- mico.orig/orb/fast_array.cc 2008-07-25 15:41:43.000000000 +0200 |
63 |
+++ mico/orb/fast_array.cc 2009-02-09 16:17:29.000000000 +0100 |
64 |
@@ -40,6 +40,7 @@ |
65 |
|
66 |
#endif // FAST_PCH |
67 |
|
68 |
+#include <limits.h> |
69 |
|
70 |
using namespace std; |
71 |
|
72 |
|
73 |
|
74 |
|
75 |
1.1 src/patchsets/mico/9999/003_all_pthread.patch |
76 |
|
77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/003_all_pthread.patch?rev=1.1&view=markup |
78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/003_all_pthread.patch?rev=1.1&content-type=text/plain |
79 |
|
80 |
Index: 003_all_pthread.patch |
81 |
=================================================================== |
82 |
When using gcc, use '-pthread' (or '-pthreads' on solaris) |
83 |
compiler flag to do all pthread specific things. |
84 |
--- configure.in.orig 2009-04-02 17:25:45 +0200 |
85 |
+++ configure.in 2009-04-02 17:32:00 +0200 |
86 |
@@ -524,7 +524,19 @@ |
87 |
) |
88 |
AC_CHECK_HEADERS(semaphore.h) |
89 |
AC_DEFINE(HAVE_PTHREADS) |
90 |
+ case "${GXX}:${target}" in |
91 |
+ yes:*solaris*|yes:*sunos*) |
92 |
+ CXXFLAGS="-pthreads ${CXXFLAGS}" |
93 |
+ LDFLAGS="-pthreads ${LDFLAGS}" |
94 |
+ ;; |
95 |
+ yes:*) |
96 |
+ CXXFLAGS="-pthread ${CXXFLAGS}" |
97 |
+ LDFLAGS="-pthread ${LDFLAGS}" |
98 |
+ ;; |
99 |
+ *) |
100 |
SHLIBS="-lpthread" |
101 |
+ ;; |
102 |
+ esac |
103 |
else |
104 |
AC_CHECK_LIB(c_r, pthread_create, use_pthreads=yes, use_pthreads=no) |
105 |
if test X"$use_pthreads" = Xyes; then |
106 |
|
107 |
|
108 |
|
109 |
1.1 src/patchsets/mico/9999/004_all_aix.patch |
110 |
|
111 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/004_all_aix.patch?rev=1.1&view=markup |
112 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/004_all_aix.patch?rev=1.1&content-type=text/plain |
113 |
|
114 |
Index: 004_all_aix.patch |
115 |
=================================================================== |
116 |
Do not add '-lstdc++' explicitly, this is c++ compiler's job. |
117 |
--- admin/mico-shld.aix.in.orig 2009-04-02 17:33:03 +0200 |
118 |
+++ admin/mico-shld.aix.in 2009-04-02 17:33:22 +0200 |
119 |
@@ -87,7 +87,7 @@ |
120 |
|
121 |
|
122 |
ldcmd="@SHARED_CC@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ \ |
123 |
- -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@ -lstdc++" |
124 |
+ -Wl,-bE:lib.exp,-bnoentry -o '$outfile' $args @LIBS@" |
125 |
|
126 |
echo "$ldcmd" |
127 |
eval "$ldcmd" |
128 |
|
129 |
|
130 |
|
131 |
1.1 src/patchsets/mico/9999/006_all_as-needed.patch |
132 |
|
133 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch?rev=1.1&view=markup |
134 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/006_all_as-needed.patch?rev=1.1&content-type=text/plain |
135 |
|
136 |
Index: 006_all_as-needed.patch |
137 |
=================================================================== |
138 |
Link libmico.so against configured libraries, |
139 |
to get -Wl,--as-needed working. #280678. |
140 |
--- orb/Makefile.orig 2011-05-26 09:28:52.629834934 +0200 |
141 |
+++ orb/Makefile 2011-05-26 09:28:59.519791273 +0200 |
142 |
@@ -30,7 +30,7 @@ |
143 |
endif |
144 |
endif |
145 |
|
146 |
-PLATFORM_LIBS = |
147 |
+PLATFORM_LIBS = $(CONFLIBS) |
148 |
ifeq ($(HAVE_CYGWIN), yes) |
149 |
ifeq ($(USE_CSL2), yes) |
150 |
PLATFORM_LIBS := $(PLATFORM_LIBS) -lssl -lcrypto |
151 |
|
152 |
|
153 |
|
154 |
1.1 src/patchsets/mico/9999/007_all_qt4-nothread.patch |
155 |
|
156 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch?rev=1.1&view=markup |
157 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/007_all_qt4-nothread.patch?rev=1.1&content-type=text/plain |
158 |
|
159 |
Index: 007_all_qt4-nothread.patch |
160 |
=================================================================== |
161 |
qt4 doesn't provide different libraries for threading. |
162 |
--- configure.in.orig 2010-01-12 16:40:06.935594142 +0100 |
163 |
+++ configure.in 2010-01-12 16:40:37.742311509 +0100 |
164 |
@@ -1124,7 +1124,7 @@ |
165 |
AC_MSG_WARN(cannot find moc. QT parts disabled.) |
166 |
HAVE_QT=no |
167 |
fi |
168 |
- if test X"$HAVE_THREADS" = Xyes; then |
169 |
+ if false && test X"$HAVE_THREADS" = Xyes; then |
170 |
AC_CHECK_LIB(qt-mt, open, qt_mt=yes, qt_mt=no) |
171 |
if test X"$qt_mt" = Xno; then |
172 |
AC_MSG_WARN(cannot find multi-threaded version of QT library. QT parts disabled.) |
173 |
|
174 |
|
175 |
|
176 |
1.1 src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch |
177 |
|
178 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch?rev=1.1&view=markup |
179 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch?rev=1.1&content-type=text/plain |
180 |
|
181 |
Index: 008_all_drop-pgsql-header-check.patch |
182 |
=================================================================== |
183 |
http://bugs.gentoo.org/show_bug.cgi?id=306255 |
184 |
|
185 |
Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it. |
186 |
--- configure.in.orig 2010-02-24 10:27:45.043267799 +0100 |
187 |
+++ configure.in 2010-02-24 10:28:09.016074329 +0100 |
188 |
@@ -1324,7 +1324,7 @@ |
189 |
AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) |
190 |
AC_CHECK_HEADERS(poll.h) |
191 |
|
192 |
-AC_CHECK_HEADERS(exception exception.h terminate.h openssl/ssl.h pgsql/libpq-fe.h) |
193 |
+AC_CHECK_HEADERS(exception exception.h terminate.h openssl/ssl.h) |
194 |
|
195 |
# QT |
196 |
AC_CHECK_HEADERS(qapplication.h qsocketnotifier.h qlineedit.h) |
197 |
|
198 |
|
199 |
|
200 |
1.1 src/patchsets/mico/9999/009_all_check-const-overload.patch |
201 |
|
202 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/009_all_check-const-overload.patch?rev=1.1&view=markup |
203 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/009_all_check-const-overload.patch?rev=1.1&content-type=text/plain |
204 |
|
205 |
Index: 009_all_check-const-overload.patch |
206 |
=================================================================== |
207 |
Checking for 'const overload' fails with 'unused variable i', |
208 |
resulting in build errors (suggesting -fpermissive) with gcc-4.6: |
209 |
http://bugs.gentoo.org/show_bug.cgi?id=365117 |
210 |
|
211 |
--- aclocal.m4.orig 2011-05-25 14:20:01.626683873 +0200 |
212 |
+++ aclocal.m4 2011-05-25 14:20:43.930773070 +0200 |
213 |
@@ -353,11 +353,12 @@ |
214 |
|
215 |
void bar (const int &, int &, const int *, int *, int *&); |
216 |
|
217 |
- void foo (S &s, const S &cs) |
218 |
+ int foo (S &s, const S &cs) |
219 |
{ |
220 |
- int i = s; i = cs; i = *s; i = *cs; |
221 |
+ int i = s; int j = cs; int k = *s; int l = *cs; |
222 |
bar (s, s, s, s, s); |
223 |
bar (cs, s, cs, s, s); |
224 |
+ return (i + j + k + l); |
225 |
} |
226 |
], |
227 |
eval "ac_cv_have_const_overload=yes", |
228 |
|
229 |
|
230 |
|
231 |
1.1 src/patchsets/mico/9999/010_all_preserve-cflags.patch |
232 |
|
233 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch?rev=1.1&view=markup |
234 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/010_all_preserve-cflags.patch?rev=1.1&content-type=text/plain |
235 |
|
236 |
Index: 010_all_preserve-cflags.patch |
237 |
=================================================================== |
238 |
Do not tweak CFLAGS/CXXFLAGS for -g/-O2 if not explicitly requested |
239 |
by configure arguments --*able-debug/--*able-optimize. |
240 |
|
241 |
--- configure.in.orig 2011-05-25 16:22:01.402618836 +0200 |
242 |
+++ configure.in 2011-05-25 16:27:35.022640710 +0200 |
243 |
@@ -112,12 +112,12 @@ |
244 |
use_repo=$enableval, use_repo=no) |
245 |
|
246 |
AC_ARG_ENABLE(optimize, |
247 |
- [ --disable-optimize do not use -O2 to compile], |
248 |
- use_opt=$enableval, use_opt=yes) |
249 |
+ [ --enable-optimize use -O2 to compile], |
250 |
+ use_opt=$enableval, use_opt=default) |
251 |
|
252 |
AC_ARG_ENABLE(debug, |
253 |
[ --enable-debug use -g to compile], |
254 |
- use_debug=$enableval, use_debug=no) |
255 |
+ use_debug=$enableval, use_debug=default) |
256 |
|
257 |
AC_ARG_ENABLE(shared, |
258 |
[ --disable-shared don't build shared libs], |
259 |
@@ -976,7 +976,7 @@ |
260 |
CONF_SHARED_CC="$CXX -shared" |
261 |
CONF_PICFLAGS=-fPIC |
262 |
CONF_LDSOFLAGS=-fPIC |
263 |
- if test X"$use_opt" != Xyes; then |
264 |
+ if test X"$use_opt" = Xno; then |
265 |
# by default Intel uses -O so we need to disable it |
266 |
CONF_OPT_FLAGS=-O0 |
267 |
use_opt=yes |
268 |
@@ -1032,17 +1032,23 @@ |
269 |
# |
270 |
|
271 |
changequote(<<, >>) |
272 |
-CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'` |
273 |
-CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /g' -e 's/ -O[0-9]* / /g'` |
274 |
-changequote([, ]) |
275 |
-if test X"$use_opt" != Xno; then |
276 |
- CXXFLAGS="$CONF_OPT_FLAGS $CXXFLAGS" |
277 |
- CFLAGS="$CONF_OPT_FLAGS $CFLAGS" |
278 |
-fi |
279 |
-if test X"$use_debug" != Xno; then |
280 |
- CXXFLAGS="$CONF_DEBUG_FLAGS $CXXFLAGS" |
281 |
- CFLAGS="$CONF_DEBUG_FLAGS $CFLAGS" |
282 |
+if test X"$use_opt" != Xdefault; then |
283 |
+ CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -O[0-9]* / /g'` |
284 |
+ CFLAGS=`echo " $CFLAGS " | sed -e 's/ -O[0-9]* / /g'` |
285 |
+ if test X"$use_opt" = Xyes; then |
286 |
+ CXXFLAGS="$CONF_OPT_FLAGS $CXXFLAGS" |
287 |
+ CFLAGS="$CONF_OPT_FLAGS $CFLAGS" |
288 |
+ fi |
289 |
fi |
290 |
+if test X"$use_debug" != Xdefault; then |
291 |
+ CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -g / /g'` |
292 |
+ CFLAGS=`echo " $CFLAGS " | sed -e 's/ -g / /g'` |
293 |
+ if test X"$use_debug" = Xyes; then |
294 |
+ CXXFLAGS="$CONF_DEBUG_FLAGS $CXXFLAGS" |
295 |
+ CFLAGS="$CONF_DEBUG_FLAGS $CFLAGS" |
296 |
+ fi |
297 |
+fi |
298 |
+changequote([, ]) |
299 |
|
300 |
if test "x$use_memcheck" = "xyes" ; then |
301 |
case $target in |
302 |
|
303 |
|
304 |
|
305 |
1.1 src/patchsets/mico/9999/011_all_gtk-check-stdlib.patch |
306 |
|
307 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/011_all_gtk-check-stdlib.patch?rev=1.1&view=markup |
308 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/011_all_gtk-check-stdlib.patch?rev=1.1&content-type=text/plain |
309 |
|
310 |
Index: 011_all_gtk-check-stdlib.patch |
311 |
=================================================================== |
312 |
Recent gcc is more strict against undeclared function calls |
313 |
like system() and exit(), breaking gtk version check. |
314 |
--- aclocal.m4.orig 2011-05-25 16:55:15.609086191 +0200 |
315 |
+++ aclocal.m4 2011-05-25 16:55:22.999136294 +0200 |
316 |
@@ -765,6 +765,7 @@ |
317 |
AC_TRY_RUN([ |
318 |
#include <gtk/gtk.h> |
319 |
#include <stdio.h> |
320 |
+#include <stdlib.h> |
321 |
|
322 |
int |
323 |
main () |
324 |
|
325 |
|
326 |
|
327 |
1.1 src/patchsets/mico/9999/012_all_early-header-check.patch |
328 |
|
329 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch?rev=1.1&view=markup |
330 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/012_all_early-header-check.patch?rev=1.1&content-type=text/plain |
331 |
|
332 |
Index: 012_all_early-header-check.patch |
333 |
=================================================================== |
334 |
The first header-check resolves AC_REQUIRE(AC_PROG_EGREP). If that is not |
335 |
run due to some condition, EGREP is unset for subsequent checks. |
336 |
This breaks the checks for function prototypes. |
337 |
|
338 |
--- configure.in.orig 2011-05-26 07:49:07.047082532 +0200 |
339 |
+++ configure.in 2011-05-26 07:52:48.130834617 +0200 |
340 |
@@ -411,6 +411,8 @@ |
341 |
AC_SUBST(EXTRA_CXXFLAGS) |
342 |
ac_compile="$ac_compile "'$EXTRA_CXXFLAGS' |
343 |
|
344 |
+AC_HEADER_STDC |
345 |
+ |
346 |
# |
347 |
# thread support |
348 |
# |
349 |
@@ -1342,7 +1344,6 @@ |
350 |
# Checks for header files. |
351 |
# |
352 |
|
353 |
-AC_HEADER_STDC |
354 |
AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h strings.h float.h ieeefp.h) |
355 |
AC_CHECK_HEADERS(sys/un.h netinet/in.h arpa/inet.h netdb.h dlfcn.h dl.h) |
356 |
AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) |
357 |
|
358 |
|
359 |
|
360 |
1.1 src/patchsets/mico/9999/100_x86-winnt_parity.patch |
361 |
|
362 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/100_x86-winnt_parity.patch?rev=1.1&view=markup |
363 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/100_x86-winnt_parity.patch?rev=1.1&content-type=text/plain |
364 |
|
365 |
Index: 100_x86-winnt_parity.patch |
366 |
=================================================================== |
367 |
Support using parity to compile on windows. |
368 |
diff -ru mico.orig/MakeVars.in mico/MakeVars.in |
369 |
--- mico.orig/MakeVars.in 2008-09-19 15:16:50 +0200 |
370 |
+++ mico/MakeVars.in 2008-09-19 14:52:24 +0200 |
371 |
@@ -28,6 +28,15 @@ |
372 |
SHARED_INSTDIR = @ABSSHRDDIR@ |
373 |
|
374 |
OSTYPE = @OSTYPE@ |
375 |
+SUBOSTYPE = @SUBOSTYPE@ |
376 |
+EXEEXT = |
377 |
+ |
378 |
+ifeq ($(OSTYPE), windows) |
379 |
+ifeq ($(SUBOSTYPE), parity) |
380 |
+EXEEXT = .exe |
381 |
+endif |
382 |
+endif |
383 |
+ |
384 |
# We need the compiler type, not just the os |
385 |
HAVE_MINGW = @HAVE_MINGW@ |
386 |
HAVE_CYGWIN = @HAVE_CYGWIN@ |
387 |
@@ -129,9 +138,9 @@ |
388 |
LATEX2HTML = latex2html |
389 |
FIG2DEV = fig2dev |
390 |
MKFAQ = $(SRCDIR)/admin/mkfaq |
391 |
-IDL = @IDL@ |
392 |
-IDLGEN = @IDL@ |
393 |
-CCMGEN = @CCMGEN@ |
394 |
+IDL = @IDL@$(EXEEXT) |
395 |
+IDLGEN = @IDL@$(EXEEXT) |
396 |
+CCMGEN = @CCMGEN@$(EXEEXT) |
397 |
MKDEPEND = @MKDEPEND@ |
398 |
# on some Solaris systems strip does not support ELF binaries ... |
399 |
IBINCMD = $(SRCDIR)/admin/install-sh -c -m 755 |
400 |
@@ -177,6 +186,7 @@ |
401 |
LDMICOCCM = -lmicoccm$(VERSION) |
402 |
|
403 |
ifeq ($(OSTYPE), windows) |
404 |
+ifneq ($(SUBOSTYPE), parity) |
405 |
ifeq ($(HAVE_SHARED), yes) |
406 |
export PATH := @LIBPATH@:$(PATH) |
407 |
NODOTVERSION = $(shell tr -d \. < $(SRCDIR)/VERSION) |
408 |
@@ -187,6 +197,7 @@ |
409 |
LIBMICOCOSS = libmicocoss$(VERSION).a |
410 |
endif |
411 |
endif |
412 |
+endif |
413 |
|
414 |
export PATH := @CPPPATH@:$(PATH):. |
415 |
|
416 |
diff -ru mico.orig/auxdir/Makefile mico/auxdir/Makefile |
417 |
--- mico.orig/auxdir/Makefile 2008-09-19 15:16:50 +0200 |
418 |
+++ mico/auxdir/Makefile 2008-09-19 14:52:24 +0200 |
419 |
@@ -127,6 +127,7 @@ |
420 |
-L../libs $(LDMICO) |
421 |
$(IDIRCMD) ../libs |
422 |
cd ../libs; rm -f $@; $(LN) ../auxdir/$@ . |
423 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../auxdir/$@.dll . ) |
424 |
|
425 |
libmicox$(VERSION).$(SOEXT): $(SHARED_X11_OBJS) |
426 |
ifeq ($(HAVE_REPO), yes) |
427 |
@@ -137,6 +138,7 @@ |
428 |
$(PURE_LDFLAGS) -lXt -lX11 -L../libs $(LDMICO) $(PLATFORM_LIBS) |
429 |
$(IDIRCMD) ../libs |
430 |
cd ../libs; rm -f $@; $(LN) ../auxdir/$@ . |
431 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../auxdir/$@.dll . ) |
432 |
|
433 |
libmicoqt$(VERSION).$(SOEXT): $(SHARED_QT_OBJS) |
434 |
ifeq ($(HAVE_REPO), yes) |
435 |
@@ -147,6 +149,7 @@ |
436 |
$(PURE_LDFLAGS) $(QT_LIBS) -L../libs $(LDMICO) |
437 |
$(IDIRCMD) ../libs |
438 |
cd ../libs; rm -f $@; $(LN) ../auxdir/$@ . |
439 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../auxdir/$@.dll . ) |
440 |
|
441 |
libmicogtk$(VERSION).$(SOEXT): $(SHARED_GTK_OBJS) |
442 |
ifeq ($(HAVE_REPO), yes) |
443 |
@@ -157,6 +160,7 @@ |
444 |
$(PURE_LDFLAGS) $(GTK_LIBS) -L../libs $(LDMICO) |
445 |
$(IDIRCMD) ../libs |
446 |
cd ../libs; rm -f $@; $(LN) ../auxdir/$@ . |
447 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../auxdir/$@.dll . ) |
448 |
|
449 |
libmicotcl$(VERSION).$(SOEXT): $(SHARED_TCL_OBJS) |
450 |
ifeq ($(HAVE_REPO), yes) |
451 |
@@ -167,6 +171,7 @@ |
452 |
$(PURE_LDFLAGS) $(TCL_LIBS) -L../libs $(LDMICO) |
453 |
$(IDIRCMD) ../libs |
454 |
cd ../libs; rm -f $@; $(LN) ../auxdir/$@ . |
455 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../auxdir/$@.dll . ) |
456 |
|
457 |
|
458 |
# static |
459 |
@@ -220,14 +225,14 @@ |
460 |
# cleaning |
461 |
|
462 |
clean: |
463 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.moc |
464 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.moc *.dll *.pdb *.exp |
465 |
-$(RM) .depend TAGS core nohup.out |
466 |
-$(RM) *.orig |
467 |
|
468 |
install: |
469 |
$(IDIRCMD) $(INSTDIR)/lib |
470 |
ifeq ($(HAVE_SHARED), yes) |
471 |
- @for i in $(SHARED_LIBS); do $(ILIBCMD) $$i $(INSTDIR)/lib; done |
472 |
+ @for i in $(SHARED_LIBS); do $(ILIBCMD) $$i $(INSTDIR)/lib; test ! -f $$i.dll || $(ILIBCMD) $$i.dll $(INSTDIR)/lib; done |
473 |
endif |
474 |
ifeq ($(HAVE_STATIC), yes) |
475 |
@for i in $(STATIC_LIBS); do $(ILIBCMD) $$i $(INSTDIR)/lib; done |
476 |
diff -ru mico.orig/ccm/Makefile mico/ccm/Makefile |
477 |
--- mico.orig/ccm/Makefile 2008-09-19 15:16:50 +0200 |
478 |
+++ mico/ccm/Makefile 2008-09-19 14:52:24 +0200 |
479 |
@@ -49,11 +49,13 @@ |
480 |
# mingw hack |
481 |
|
482 |
ifeq ($(OSTYPE), windows) |
483 |
+ifneq ($(SUBOSTYPE), parity) |
484 |
ifeq ($(HAVE_SHARED), yes) |
485 |
HAVE_SHARED := no |
486 |
HAVE_STATIC := yes |
487 |
endif |
488 |
endif |
489 |
+endif |
490 |
|
491 |
# normal rules |
492 |
|
493 |
@@ -65,15 +67,15 @@ |
494 |
LIBMICOCCM := libmicoccm$(VERSION).$(SOEXT) |
495 |
ifeq ($(HAVE_STATIC), yes) |
496 |
prg: .depend libmicoccm$(VERSION).$(SOEXT) libmicoccm$(VERSION).a \ |
497 |
- mico-ccm componentserver mico-ccmd ccmload |
498 |
+ mico-ccm$(EXEEXT) componentserver$(EXEEXT) mico-ccmd$(EXEEXT) ccmload$(EXEEXT) |
499 |
else |
500 |
prg: .depend libmicoccm$(VERSION).$(SOEXT) \ |
501 |
- mico-ccm componentserver mico-ccmd ccmload |
502 |
+ mico-ccm$(EXEEXT) componentserver$(EXEEXT) mico-ccmd$(EXEEXT) ccmload$(EXEEXT) |
503 |
endif |
504 |
else |
505 |
LIBMICOCCM := libmicoccm$(VERSION).a |
506 |
prg: .depend libmicoccm$(VERSION).a \ |
507 |
- mico-ccm componentserver mico-ccmd ccmload |
508 |
+ mico-ccm$(EXEEXT) componentserver$(EXEEXT) mico-ccmd$(EXEEXT) ccmload$(EXEEXT) |
509 |
endif |
510 |
else |
511 |
all: |
512 |
@@ -81,17 +83,17 @@ |
513 |
prg: |
514 |
endif |
515 |
|
516 |
-mico-ccm: ../idl/libidl.a ../orb/$(LIBMICO) ../ir/$(LIBMICOIR) $(LIBMICOCCM) mico-ccm.o |
517 |
+mico-ccm$(EXEEXT): ../idl/libidl.a ../orb/$(LIBMICO) ../ir/$(LIBMICOIR) $(LIBMICOCCM) mico-ccm.o |
518 |
$(CXX) -o $@ $(LDFLAGS) mico-ccm.o -L. $(LDMICOCCM) $(LDMICOIR) $(LDLIBS) |
519 |
$(POSTLD) $@ |
520 |
|
521 |
-componentserver: ../orb/$(LIBMICO) $(LIBMICOCCM) componentserver.o |
522 |
+componentserver$(EXEEXT): ../orb/$(LIBMICO) $(LIBMICOCCM) componentserver.o |
523 |
$(CXX) -o $@ $(LDFLAGS) componentserver.o -L. $(LDMICOCCM) $(LDLIBS) |
524 |
|
525 |
-mico-ccmd: ../orb/$(LIBMICO) $(LIBMICOCCM) mico-ccmd.o |
526 |
+mico-ccmd$(EXEEXT): ../orb/$(LIBMICO) $(LIBMICOCCM) mico-ccmd.o |
527 |
$(CXX) -o $@ $(LDFLAGS) mico-ccmd.o -L. $(LDMICOCCM) $(LDLIBS) |
528 |
|
529 |
-ccmload: ../orb/$(LIBMICO) $(LIBMICOCCM) ccmload.o |
530 |
+ccmload$(EXEEXT): ../orb/$(LIBMICO) $(LIBMICOCCM) ccmload.o |
531 |
$(CXX) -o $@ $(LDFLAGS) ccmload.o -L. $(LDMICOCCM) $(LDMICOCOSS) $(LDLIBS) |
532 |
|
533 |
libmicoccm$(VERSION).$(SOEXT): $(SHARED_OBJS) |
534 |
@@ -105,6 +107,7 @@ |
535 |
$(LDSO) -o libmicoccm$(VERSION) $(SHARED_OBJS) -L../libs $(LDMICO) $(PLATFORM_LIBS) |
536 |
$(IDIRCMD) ../libs |
537 |
cd ../libs; $(RM) $@; $(LN) ../ccm/$@ . |
538 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../ccm/$@.dll . ) |
539 |
|
540 |
libmicoccm$(VERSION).a: $(STATIC_OBJS) |
541 |
ifeq ($(HAVE_REPO), yes) |
542 |
@@ -121,22 +124,23 @@ |
543 |
# cleaning |
544 |
|
545 |
clean: |
546 |
- -$(RM) mico-ccmd ccmload componentserver mico-ccm libmicoccm* |
547 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid |
548 |
+ -$(RM) mico-ccmd$(EXEEXT) ccmload$(EXEEXT) componentserver$(EXEEXT) mico-ccm$(EXEEXT) libmicoccm* |
549 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.dll *.pdb *.exp |
550 |
-$(RM) .depend TAGS core nohup.out |
551 |
|
552 |
install: all |
553 |
ifeq ($(USE_CCM), yes) |
554 |
$(IDIRCMD) $(INSTDIR)/bin |
555 |
- $(IBINCMD) mico-ccm $(INSTDIR)/bin |
556 |
- $(IBINCMD) componentserver $(INSTDIR)/bin |
557 |
- $(IBINCMD) mico-ccmd $(INSTDIR)/bin |
558 |
- $(IBINCMD) ccmload $(INSTDIR)/bin |
559 |
+ $(IBINCMD) mico-ccm$(EXEEXT) $(INSTDIR)/bin |
560 |
+ $(IBINCMD) componentserver$(EXEEXT) $(INSTDIR)/bin |
561 |
+ $(IBINCMD) mico-ccmd$(EXEEXT) $(INSTDIR)/bin |
562 |
+ $(IBINCMD) ccmload$(EXEEXT) $(INSTDIR)/bin |
563 |
ifeq ($(HAVE_STATIC), yes) |
564 |
$(ILIBCMD) libmicoccm$(VERSION).a $(INSTDIR)/lib |
565 |
endif |
566 |
ifeq ($(HAVE_SHARED), yes) |
567 |
$(ILIBCMD) libmicoccm$(VERSION).$(SOEXT) $(INSTDIR)/lib |
568 |
+ test -t libmicoccm$(VERSION).$(SOEXT).dll && $(ILIBCMD) libmicoccm$(VERSION).$(SOEXT).dll $(INSTDIR)/lib |
569 |
endif |
570 |
endif |
571 |
|
572 |
diff -ru mico.orig/configure.in mico/configure.in |
573 |
--- mico.orig/configure.in 2008-09-19 15:16:50 +0200 |
574 |
+++ mico/configure.in 2008-09-19 14:52:24 +0200 |
575 |
@@ -375,11 +375,15 @@ |
576 |
AC_MSG_CHECKING(OS Type) |
577 |
gxxversion=`$CXX -v 2>&1` |
578 |
case $gxxversion in |
579 |
-*mingw*special*) |
580 |
+*mingw*special*|*parity*) |
581 |
# |
582 |
- # This is the MinGW compiler in a Cygwin environment |
583 |
+ # This is the MinGW compiler in a Cygwin environment, |
584 |
+ # or the parity compiler in an interix environment |
585 |
# |
586 |
OSTYPE=windows |
587 |
+ case $gxxversion in |
588 |
+ *parity*) SUBOSTYPE=parity ;; |
589 |
+ esac |
590 |
RMPROG="rm -f" |
591 |
LNPROG="cp" |
592 |
;; |
593 |
@@ -389,8 +393,9 @@ |
594 |
LNPROG="ln -f -s" |
595 |
;; |
596 |
esac |
597 |
-AC_MSG_RESULT($OSTYPE) |
598 |
+AC_MSG_RESULT([$OSTYPE ($SUBOSTYPE)]) |
599 |
AC_SUBST(OSTYPE) |
600 |
+AC_SUBST(SUBOSTYPE) |
601 |
AC_SUBST(RMPROG) |
602 |
AC_SUBST(LNPROG) |
603 |
|
604 |
diff -ru mico.orig/coss/Makefile mico/coss/Makefile |
605 |
--- mico.orig/coss/Makefile 2008-09-19 15:16:50 +0200 |
606 |
+++ mico/coss/Makefile 2008-09-19 14:52:24 +0200 |
607 |
@@ -193,12 +193,14 @@ |
608 |
# mingw hack |
609 |
|
610 |
ifeq ($(OSTYPE), windows) |
611 |
+ifneq ($(SUBOSTYPE), parity) |
612 |
ifeq ($(HAVE_SHARED), yes) |
613 |
HAVE_SHARED_EXCEPTS := no |
614 |
HAVE_SHARED := no |
615 |
HAVE_STATIC := yes |
616 |
endif |
617 |
endif |
618 |
+endif |
619 |
|
620 |
|
621 |
all: lib prg |
622 |
@@ -241,6 +243,7 @@ |
623 |
-L../libs $(LDMICO) $(PLATFORM_LIBS) |
624 |
$(IDIRCMD) ../libs |
625 |
cd ../libs; $(RM) $@; $(LN) ../coss/$@ . |
626 |
+ test ! -f $@.dll || ( cd ../libs; rm -f $@.dll; $(LN) ../coss/$@.dll . ) |
627 |
endif |
628 |
|
629 |
# static |
630 |
@@ -261,7 +264,7 @@ |
631 |
|
632 |
clean: |
633 |
for i in $(CLEANDIRS); do $(MAKE) -C $$i clean || exit 1; done |
634 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid |
635 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.objid *.dll *.pdb *.exp |
636 |
-$(RM) .depend TAGS core nohup.out |
637 |
|
638 |
idlcompile: |
639 |
@@ -274,6 +277,7 @@ |
640 |
ifneq ($(strip $(SUBDIRS)),) |
641 |
ifeq ($(HAVE_SHARED_EXCEPTS), yes) |
642 |
$(ILIBCMD) libmicocoss$(VERSION).$(SOEXT) $(INSTDIR)/lib |
643 |
+ test ! -f libmicocoss$(VERSION).$(SOEXT).dll || $(ILIBCMD) libmicocoss$(VERSION).$(SOEXT).dll $(INSTDIR)/lib |
644 |
ifeq ($(HAVE_STATIC), yes) |
645 |
$(ILIBCMD) libmicocoss$(VERSION).a $(INSTDIR)/lib |
646 |
endif |
647 |
diff -ru mico.orig/coss/events/Makefile mico/coss/events/Makefile |
648 |
--- mico.orig/coss/events/Makefile 2008-09-19 15:16:50 +0200 |
649 |
+++ mico/coss/events/Makefile 2008-09-19 14:52:24 +0200 |
650 |
@@ -51,12 +51,12 @@ |
651 |
lib: |
652 |
endif |
653 |
|
654 |
-prg: .depend eventd |
655 |
+prg: .depend eventd$(EXEEXT) |
656 |
|
657 |
idlcompile: CosEventComm.cc CosEventChannelAdmin.cc |
658 |
|
659 |
-eventd: $(SRV_OBJS) ../../orb/$(LIBMICO) |
660 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o eventd |
661 |
+eventd$(EXEEXT): $(SRV_OBJS) ../../orb/$(LIBMICO) |
662 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o $@ |
663 |
$(POSTLD) $@ |
664 |
|
665 |
CosEventComm.h CosEventComm.cc: ../../include/coss/CosEventComm.idl $(IDL) |
666 |
@@ -74,7 +74,7 @@ |
667 |
# cleaning |
668 |
|
669 |
clean: |
670 |
- -$(RM) *.o *.a *~ *.rpo *.objid eventd |
671 |
+ -$(RM) *.o *.a *~ *.rpo *.objid eventd$(EXEEXT) |
672 |
-$(RM) .depend TAGS core nohup.out |
673 |
-$(RM) CosEventChannelAdmin.h CosEventChannelAdmin.cc |
674 |
-$(RM) ../../include/coss/CosEventChannelAdmin.h |
675 |
@@ -83,7 +83,7 @@ |
676 |
|
677 |
install: |
678 |
$(IDIRCMD) $(INSTDIR)/bin |
679 |
- $(IBINCMD) eventd $(INSTDIR)/bin |
680 |
+ $(IBINCMD) eventd$(EXEEXT) $(INSTDIR)/bin |
681 |
|
682 |
ifeq (.depend, $(wildcard .depend)) |
683 |
include .depend |
684 |
diff -ru mico.orig/coss/externalization/Makefile mico/coss/externalization/Makefile |
685 |
--- mico.orig/coss/externalization/Makefile 2008-09-19 15:16:50 +0200 |
686 |
+++ mico/coss/externalization/Makefile 2008-09-19 14:52:24 +0200 |
687 |
@@ -63,26 +63,26 @@ |
688 |
lib: .depend $(STATIC_OBJS) |
689 |
endif |
690 |
|
691 |
-prg: .depend extnoded extcontainmentd extreferenced streamd extcriteriad |
692 |
+prg: .depend extnoded$(EXEEXT) extcontainmentd$(EXEEXT) extreferenced$(EXEEXT) streamd$(EXEEXT) extcriteriad$(EXEEXT) |
693 |
|
694 |
-streamd: streamd.o ../../orb/$(LIBMICO) |
695 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) streamd.o $(LDLIBS) -o streamd |
696 |
+streamd$(EXEEXT): streamd.o ../../orb/$(LIBMICO) |
697 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) streamd.o $(LDLIBS) -o $@ |
698 |
$(POSTLD) $@ |
699 |
|
700 |
-extnoded: extnoded.o ../../orb/$(LIBMICO) |
701 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) extnoded.o $(LDLIBS) -o extnoded |
702 |
+extnoded$(EXEEXT): extnoded.o ../../orb/$(LIBMICO) |
703 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) extnoded.o $(LDLIBS) -o $@ |
704 |
$(POSTLD) $@ |
705 |
|
706 |
-extcriteriad: extcriteriad.o ../../orb/$(LIBMICO) |
707 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) extcriteriad.o $(LDLIBS) -o extcriteriad |
708 |
+extcriteriad$(EXEEXT): extcriteriad.o ../../orb/$(LIBMICO) |
709 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) extcriteriad.o $(LDLIBS) -o $@ |
710 |
$(POSTLD) $@ |
711 |
|
712 |
-extcontainmentd: extcontainmentd.o ../../orb/$(LIBMICO) |
713 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) extcontainmentd.o $(LDLIBS) -o extcontainmentd |
714 |
+extcontainmentd$(EXEEXT): extcontainmentd.o ../../orb/$(LIBMICO) |
715 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) extcontainmentd.o $(LDLIBS) -o $@ |
716 |
$(POSTLD) $@ |
717 |
|
718 |
-extreferenced: extreferenced.o ../../orb/$(LIBMICO) |
719 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced |
720 |
+extreferenced$(EXEEXT): extreferenced.o ../../orb/$(LIBMICO) |
721 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o $@ |
722 |
$(POSTLD) $@ |
723 |
|
724 |
idlcompile: CosExternalization.cc CosExternalizationContainment.cc CosExternalizationReference.cc |
725 |
@@ -109,7 +109,7 @@ |
726 |
# cleaning |
727 |
|
728 |
clean: |
729 |
- -$(RM) *.o *.a *~ *.rpo *.objid extnoded extcontainmentd extreferenced streamd extcriteriad |
730 |
+ -$(RM) *.o *.a *~ *.rpo *.objid extnoded$(EXEEXT) extcontainmentd$(EXEEXT) extreferenced$(EXEEXT) streamd$(EXEEXT) extcriteriad$(EXEEXT) |
731 |
-$(RM) .depend TAGS core nohup.out |
732 |
-$(RM) CosExternalization.h CosExternalization.cc |
733 |
-$(RM) ../../include/coss/CosExternalization.h |
734 |
@@ -120,15 +120,15 @@ |
735 |
|
736 |
install: |
737 |
$(IDIRCMD) $(INSTDIR)/bin |
738 |
- $(IBINCMD) streamd $(INSTDIR)/bin |
739 |
+ $(IBINCMD) streamd$(EXEEXT) $(INSTDIR)/bin |
740 |
$(IDIRCMD) $(INSTDIR)/bin |
741 |
- $(IBINCMD) extnoded $(INSTDIR)/bin |
742 |
+ $(IBINCMD) extnoded$(EXEEXT) $(INSTDIR)/bin |
743 |
$(IDIRCMD) $(INSTDIR)/bin |
744 |
- $(IBINCMD) extcontainmentd $(INSTDIR)/bin |
745 |
+ $(IBINCMD) extcontainmentd$(EXEEXT) $(INSTDIR)/bin |
746 |
$(IDIRCMD) $(INSTDIR)/bin |
747 |
- $(IBINCMD) extreferenced $(INSTDIR)/bin |
748 |
+ $(IBINCMD) extreferenced$(EXEEXT) $(INSTDIR)/bin |
749 |
$(IDIRCMD) $(INSTDIR)/bin |
750 |
- $(IBINCMD) extcriteriad $(INSTDIR)/bin |
751 |
+ $(IBINCMD) extcriteriad$(EXEEXT) $(INSTDIR)/bin |
752 |
|
753 |
|
754 |
ifeq (.depend, $(wildcard .depend)) |
755 |
diff -ru mico.orig/coss/lifecycle/Makefile mico/coss/lifecycle/Makefile |
756 |
--- mico.orig/coss/lifecycle/Makefile 2008-09-19 15:16:50 +0200 |
757 |
+++ mico/coss/lifecycle/Makefile 2008-09-19 14:52:24 +0200 |
758 |
@@ -71,34 +71,34 @@ |
759 |
lib: .depend $(STATIC_OBJS) |
760 |
endif |
761 |
|
762 |
-prg: .depend lifenoded lifecontainmentd lifereferenced operationd lifecriteriad factoryfinderd genericfactory |
763 |
+prg: .depend lifenoded$(EXEEXT) lifecontainmentd$(EXEEXT) lifereferenced$(EXEEXT) operationd$(EXEEXT) lifecriteriad$(EXEEXT) factoryfinderd$(EXEEXT) genericfactory$(EXEEXT) |
764 |
|
765 |
-operationd: operationd.o ../../orb/$(LIBMICO) |
766 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) operationd.o $(LDLIBS) -o operationd |
767 |
+operationd$(EXEEXT): operationd.o ../../orb/$(LIBMICO) |
768 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) operationd.o $(LDLIBS) -o $@ |
769 |
$(POSTLD) $@ |
770 |
|
771 |
-lifenoded: lifenoded.o ../../orb/$(LIBMICO) |
772 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) lifenoded.o $(LDLIBS) -o lifenoded |
773 |
+lifenoded$(EXEEXT): lifenoded.o ../../orb/$(LIBMICO) |
774 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) lifenoded.o $(LDLIBS) -o $@ |
775 |
$(POSTLD) $@ |
776 |
|
777 |
-lifecontainmentd: lifecontainmentd.o ../../orb/$(LIBMICO) |
778 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) lifecontainmentd.o $(LDLIBS) -o lifecontainmentd |
779 |
+lifecontainmentd$(EXEEXT): lifecontainmentd.o ../../orb/$(LIBMICO) |
780 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) lifecontainmentd.o $(LDLIBS) -o $@ |
781 |
$(POSTLD) $@ |
782 |
|
783 |
-lifereferenced: lifereferenced.o ../../orb/$(LIBMICO) |
784 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) lifereferenced.o $(LDLIBS) -o lifereferenced |
785 |
+lifereferenced$(EXEEXT): lifereferenced.o ../../orb/$(LIBMICO) |
786 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) lifereferenced.o $(LDLIBS) -o $@ |
787 |
$(POSTLD) $@ |
788 |
|
789 |
-lifecriteriad: lifecriteriad.o ../../orb/$(LIBMICO) |
790 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) lifecriteriad.o $(LDLIBS) -o lifecriteriad |
791 |
+lifecriteriad$(EXEEXT): lifecriteriad.o ../../orb/$(LIBMICO) |
792 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) lifecriteriad.o $(LDLIBS) -o $@ |
793 |
$(POSTLD) $@ |
794 |
|
795 |
-factoryfinderd: factoryfinderd.o ../../orb/$(LIBMICO) |
796 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) factoryfinderd.o $(LDLIBS) -o factoryfinderd |
797 |
+factoryfinderd$(EXEEXT): factoryfinderd.o ../../orb/$(LIBMICO) |
798 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) factoryfinderd.o $(LDLIBS) -o $@ |
799 |
$(POSTLD) $@ |
800 |
|
801 |
-genericfactory: genericfactory.o ../../orb/$(LIBMICO) |
802 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory |
803 |
+genericfactory$(EXEEXT): genericfactory.o ../../orb/$(LIBMICO) |
804 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o $@ |
805 |
$(POSTLD) $@ |
806 |
|
807 |
idlcompile: CosLifeCycle.cc CosCompoundLifeCycle.cc CosLifeCycleContainment.cc CosLifeCycleReference.cc |
808 |
@@ -131,7 +131,7 @@ |
809 |
# cleaning |
810 |
|
811 |
clean: |
812 |
- -$(RM) *.o *.a *~ *.rpo *.objid lifenoded lifecontainmentd lifereferenced operationd lifecriteriad factoryfinderd genericfactory |
813 |
+ -$(RM) *.o *.a *~ *.rpo *.objid lifenoded$(EXEEXT) lifecontainmentd$(EXEEXT) lifereferenced$(EXEEXT) operationd$(EXEEXT) lifecriteriad$(EXEEXT) factoryfinderd$(EXEEXT) genericfactory$(EXEEXT) |
814 |
-$(RM) .depend TAGS core nohup.out |
815 |
-$(RM) CosLifeCycle.h CosLifeCycle.cc |
816 |
-$(RM) ../../include/coss/CosLifeCycle.h |
817 |
@@ -144,13 +144,13 @@ |
818 |
|
819 |
install: |
820 |
$(IDIRCMD) $(INSTDIR)/bin |
821 |
- $(IBINCMD) operationd $(INSTDIR)/bin |
822 |
+ $(IBINCMD) operationd$(EXEEXT) $(INSTDIR)/bin |
823 |
$(IDIRCMD) $(INSTDIR)/bin |
824 |
- $(IBINCMD) lifenoded $(INSTDIR)/bin |
825 |
+ $(IBINCMD) lifenoded$(EXEEXT) $(INSTDIR)/bin |
826 |
$(IDIRCMD) $(INSTDIR)/bin |
827 |
- $(IBINCMD) lifecontainmentd $(INSTDIR)/bin |
828 |
+ $(IBINCMD) lifecontainmentd$(EXEEXT) $(INSTDIR)/bin |
829 |
$(IDIRCMD) $(INSTDIR)/bin |
830 |
- $(IBINCMD) lifereferenced $(INSTDIR)/bin |
831 |
+ $(IBINCMD) lifereferenced$(EXEEXT) $(INSTDIR)/bin |
832 |
|
833 |
|
834 |
ifeq (.depend, $(wildcard .depend)) |
835 |
diff -ru mico.orig/coss/naming/Makefile mico/coss/naming/Makefile |
836 |
--- mico.orig/coss/naming/Makefile 2008-09-19 15:16:50 +0200 |
837 |
+++ mico/coss/naming/Makefile 2008-09-19 14:52:24 +0200 |
838 |
@@ -51,36 +51,36 @@ |
839 |
lib: |
840 |
endif |
841 |
|
842 |
-prg: .depend nsd nsadmin |
843 |
+prg: .depend nsd$(EXEEXT) nsadmin$(EXEEXT) |
844 |
|
845 |
idlcompile: CosNaming.cc CosNaming_skel.cc |
846 |
|
847 |
-nsd: $(SRV_OBJS) ../../orb/$(LIBMICO) |
848 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o nsd |
849 |
+nsd$(EXEEXT): $(SRV_OBJS) ../../orb/$(LIBMICO) |
850 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o $@ |
851 |
$(POSTLD) $@ |
852 |
|
853 |
-nsadmin: $(CLNT_OBJS) ../../orb/$(LIBMICO) |
854 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CLNT_OBJS) $(ALLLIBS) -o nsadmin |
855 |
+nsadmin$(EXEEXT): $(CLNT_OBJS) ../../orb/$(LIBMICO) |
856 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CLNT_OBJS) $(ALLLIBS) -o $@ |
857 |
$(POSTLD) $@ |
858 |
|
859 |
|
860 |
CosNaming.h CosNaming.cc CosNaming_skel.cc .NOTPARALLEL: ../../include/coss/CosNaming.idl $(IDL) |
861 |
- $(IDL) $(IDLFLAGS) --c++-skel --name CosNaming \ |
862 |
+ $(IDL) $(IDLFLAGS) --c++-skel --name CosNaming --windows-dll cossnaming \ |
863 |
../../include/coss/CosNaming.idl |
864 |
cp CosNaming.h ../../include/coss |
865 |
|
866 |
# cleaning |
867 |
|
868 |
clean: |
869 |
- -$(RM) *.o *.a *~ *.rpo *.ii *.ti *.objid nsd nsadmin |
870 |
+ -$(RM) *.o *.a *~ *.rpo *.ii *.ti *.objid nsd$(EXEEXT) nsadmin$(EXEEXT) |
871 |
-$(RM) .depend TAGS core nohup.out |
872 |
-$(RM) CosNaming.h CosNaming.cc ../../include/coss/CosNaming.h \ |
873 |
CosNaming_skel.cc |
874 |
|
875 |
install: |
876 |
$(IDIRCMD) $(INSTDIR)/bin |
877 |
- $(IBINCMD) nsd $(INSTDIR)/bin |
878 |
- $(IBINCMD) nsadmin $(INSTDIR)/bin |
879 |
+ $(IBINCMD) nsd$(EXEEXT) $(INSTDIR)/bin |
880 |
+ $(IBINCMD) nsadmin$(EXEEXT) $(INSTDIR)/bin |
881 |
|
882 |
ifeq (.depend, $(wildcard .depend)) |
883 |
include .depend |
884 |
diff -ru mico.orig/coss/property/Makefile mico/coss/property/Makefile |
885 |
--- mico.orig/coss/property/Makefile 2008-09-19 15:16:50 +0200 |
886 |
+++ mico/coss/property/Makefile 2008-09-19 14:52:24 +0200 |
887 |
@@ -52,12 +52,12 @@ |
888 |
lib: |
889 |
endif |
890 |
|
891 |
-prg: .depend propertyd |
892 |
+prg: .depend propertyd$(EXEEXT) |
893 |
|
894 |
idlcompile: PropertyService.cc |
895 |
|
896 |
-propertyd: $(SRV_OBJS) ../../orb/$(LIBMICO) |
897 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o propertyd |
898 |
+propertyd$(EXEEXT): $(SRV_OBJS) ../../orb/$(LIBMICO) |
899 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o $@ |
900 |
$(POSTLD) $@ |
901 |
|
902 |
PropertyService.h PropertyService.cc: ../../include/coss/PropertyService.idl $(IDL) |
903 |
@@ -72,11 +72,11 @@ |
904 |
-$(RM) *.o *.a *~ *.rpo *.objid |
905 |
-$(RM) .depend TAGS core nohup.out |
906 |
-$(RM) PropertyService.h PropertyService.cc ../../include/coss/PropertyService.h |
907 |
- -$(RM) propertyd |
908 |
+ -$(RM) propertyd$(EXEEXT) |
909 |
|
910 |
install: |
911 |
$(IDIRCMD) $(INSTDIR)/bin |
912 |
- $(IBINCMD) propertyd $(INSTDIR)/bin |
913 |
+ $(IBINCMD) propertyd$(EXEEXT) $(INSTDIR)/bin |
914 |
|
915 |
ifeq (.depend, $(wildcard .depend)) |
916 |
include .depend |
917 |
diff -ru mico.orig/coss/relship/Makefile mico/coss/relship/Makefile |
918 |
--- mico.orig/coss/relship/Makefile 2008-09-19 15:16:50 +0200 |
919 |
+++ mico/coss/relship/Makefile 2008-09-19 14:52:24 +0200 |
920 |
@@ -70,32 +70,32 @@ |
921 |
lib: |
922 |
endif |
923 |
|
924 |
-prg: .depend traversald noded containmentd referenced randomd proxyd |
925 |
+prg: .depend traversald$(EXEEXT) noded$(EXEEXT) containmentd$(EXEEXT) referenced$(EXEEXT) randomd$(EXEEXT) proxyd$(EXEEXT) |
926 |
|
927 |
idlcompile: $(OMG_SRCS) $(EXT_SRCS) |
928 |
|
929 |
-traversald: traversald.o ../../orb/$(LIBMICO) |
930 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) traversald.o $(LDLIBS) -o traversald |
931 |
+traversald$(EXEEXT): traversald.o ../../orb/$(LIBMICO) |
932 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) traversald.o $(LDLIBS) -o $@ |
933 |
$(POSTLD) $@ |
934 |
|
935 |
-noded: noded.o ../../orb/$(LIBMICO) |
936 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) noded.o $(LDLIBS) -o noded |
937 |
+noded$(EXEEXT): noded.o ../../orb/$(LIBMICO) |
938 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) noded.o $(LDLIBS) -o $@ |
939 |
$(POSTLD) $@ |
940 |
|
941 |
-containmentd: containmentd.o ../../orb/$(LIBMICO) |
942 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) containmentd.o $(LDLIBS) -o containmentd |
943 |
+containmentd$(EXEEXT): containmentd.o ../../orb/$(LIBMICO) |
944 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) containmentd.o $(LDLIBS) -o $@ |
945 |
$(POSTLD) $@ |
946 |
|
947 |
-referenced: referenced.o ../../orb/$(LIBMICO) |
948 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) referenced.o $(LDLIBS) -o referenced |
949 |
+referenced$(EXEEXT): referenced.o ../../orb/$(LIBMICO) |
950 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) referenced.o $(LDLIBS) -o $@ |
951 |
$(POSTLD) $@ |
952 |
|
953 |
-randomd: randomd.o ../../orb/$(LIBMICO) |
954 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) randomd.o $(LDLIBS) -o randomd |
955 |
+randomd$(EXEEXT): randomd.o ../../orb/$(LIBMICO) |
956 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) randomd.o $(LDLIBS) -o $@ |
957 |
$(POSTLD) $@ |
958 |
|
959 |
-proxyd: proxyd.o ../../orb/$(LIBMICO) |
960 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) proxyd.o $(LDLIBS) -o proxyd |
961 |
+proxyd$(EXEEXT): proxyd.o ../../orb/$(LIBMICO) |
962 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) proxyd.o $(LDLIBS) -o $@ |
963 |
$(POSTLD) $@ |
964 |
|
965 |
CosObjectIdentity.h CosObjectIdentity.cc: \ |
966 |
@@ -150,7 +150,7 @@ |
967 |
# cleaning |
968 |
|
969 |
clean: |
970 |
- -$(RM) *.o *.a *~ *.rpo *.objid traversald noded containmentd referenced randomd proxyd |
971 |
+ -$(RM) *.o *.a *~ *.rpo *.objid traversald$(EXEEXT) noded$(EXEEXT) containmentd$(EXEEXT) referenced$(EXEEXT) randomd$(EXEEXT) proxyd$(EXEEXT) |
972 |
-$(RM) .depend TAGS core nohup.out |
973 |
-$(RM) CosObjectIdentity.h CosObjectIdentity.cc |
974 |
-$(RM) ../../include/coss/CosObjectIdentity.h |
975 |
@@ -171,17 +171,17 @@ |
976 |
|
977 |
install: |
978 |
$(IDIRCMD) $(INSTDIR)/bin |
979 |
- $(IBINCMD) traversald $(INSTDIR)/bin |
980 |
+ $(IBINCMD) traversald$(EXEEXT) $(INSTDIR)/bin |
981 |
$(IDIRCMD) $(INSTDIR)/bin |
982 |
- $(IBINCMD) noded $(INSTDIR)/bin |
983 |
+ $(IBINCMD) noded$(EXEEXT) $(INSTDIR)/bin |
984 |
$(IDIRCMD) $(INSTDIR)/bin |
985 |
- $(IBINCMD) containmentd $(INSTDIR)/bin |
986 |
+ $(IBINCMD) containmentd$(EXEEXT) $(INSTDIR)/bin |
987 |
$(IDIRCMD) $(INSTDIR)/bin |
988 |
- $(IBINCMD) referenced $(INSTDIR)/bin |
989 |
+ $(IBINCMD) referenced$(EXEEXT) $(INSTDIR)/bin |
990 |
$(IDIRCMD) $(INSTDIR)/bin |
991 |
- $(IBINCMD) randomd $(INSTDIR)/bin |
992 |
+ $(IBINCMD) randomd$(EXEEXT) $(INSTDIR)/bin |
993 |
$(IDIRCMD) $(INSTDIR)/bin |
994 |
- $(IBINCMD) proxyd $(INSTDIR)/bin |
995 |
+ $(IBINCMD) proxyd$(EXEEXT) $(INSTDIR)/bin |
996 |
|
997 |
|
998 |
ifeq (.depend, $(wildcard .depend)) |
999 |
diff -ru mico.orig/coss/time/Makefile mico/coss/time/Makefile |
1000 |
--- mico.orig/coss/time/Makefile 2008-09-19 15:16:50 +0200 |
1001 |
+++ mico/coss/time/Makefile 2008-09-19 14:52:24 +0200 |
1002 |
@@ -50,12 +50,12 @@ |
1003 |
lib: |
1004 |
endif |
1005 |
|
1006 |
-prg: .depend timed |
1007 |
+prg: .depend timed$(EXEEXT) |
1008 |
|
1009 |
idlcompile: CosTime.cc |
1010 |
|
1011 |
-timed: $(SRV_OBJS) ../../orb/$(LIBMICO) |
1012 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o timed |
1013 |
+timed$(EXEEXT): $(SRV_OBJS) ../../orb/$(LIBMICO) |
1014 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o $@ |
1015 |
$(POSTLD) $@ |
1016 |
|
1017 |
CosTime.h CosTime.cc: ../../include/coss/CosTime.idl $(IDL) |
1018 |
@@ -74,14 +74,14 @@ |
1019 |
# cleaning |
1020 |
|
1021 |
clean: |
1022 |
- -$(RM) *.o *.a *~ *.rpo *.objid timed |
1023 |
+ -$(RM) *.o *.a *~ *.rpo *.objid timed$(EXEEXT) |
1024 |
-$(RM) .depend TAGS core nohup.out |
1025 |
-$(RM) CosTime.h CosTime.cc |
1026 |
-$(RM) ../../include/coss/CosTime.h |
1027 |
|
1028 |
install: |
1029 |
$(IDIRCMD) $(INSTDIR)/bin |
1030 |
- $(IBINCMD) timed $(INSTDIR)/bin |
1031 |
+ $(IBINCMD) timed$(EXEEXT) $(INSTDIR)/bin |
1032 |
|
1033 |
ifeq (.depend, $(wildcard .depend)) |
1034 |
include .depend |
1035 |
diff -ru mico.orig/coss/trader/Makefile mico/coss/trader/Makefile |
1036 |
--- mico.orig/coss/trader/Makefile 2008-09-19 15:16:50 +0200 |
1037 |
+++ mico/coss/trader/Makefile 2008-09-19 14:52:24 +0200 |
1038 |
@@ -62,12 +62,12 @@ |
1039 |
lib: |
1040 |
endif |
1041 |
|
1042 |
-prg: .depend traderd |
1043 |
+prg: .depend traderd$(EXEEXT) |
1044 |
|
1045 |
idlcompile: CosTrading.cc CosTrading_skel.cc CosTradingRepos.cc CosTradingRepos_skel.cc |
1046 |
|
1047 |
-traderd: $(SRV_OBJS) ../../orb/$(LIBMICO) |
1048 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o traderd |
1049 |
+traderd$(EXEEXT): $(SRV_OBJS) ../../orb/$(LIBMICO) |
1050 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(SRV_OBJS) $(LDLIBS) -o $@ |
1051 |
$(POSTLD) $@ |
1052 |
|
1053 |
|
1054 |
@@ -83,7 +83,7 @@ |
1055 |
# cleaning |
1056 |
|
1057 |
clean: |
1058 |
- -$(RM) *.o *.a *~ *.rpo *.objid traderd |
1059 |
+ -$(RM) *.o *.a *~ *.rpo *.objid traderd$(EXEEXT) |
1060 |
-$(RM) .depend TAGS core nohup.out |
1061 |
-$(RM) CosTrading.h CosTrading.cc CosTradingRepos.h CosTradingRepos.cc |
1062 |
-$(RM) ../../include/coss/CosTrading.h ../../include/coss/CosTradingRepos.h |
1063 |
@@ -91,7 +91,7 @@ |
1064 |
|
1065 |
install: |
1066 |
$(IDIRCMD) $(INSTDIR)/bin |
1067 |
- $(IBINCMD) traderd $(INSTDIR)/bin |
1068 |
+ $(IBINCMD) traderd$(EXEEXT) $(INSTDIR)/bin |
1069 |
|
1070 |
generate: |
1071 |
$(BISON) -d -t -v -o yacc.c yacc.yy |
1072 |
diff -ru mico.orig/coss/wireless/Makefile mico/coss/wireless/Makefile |
1073 |
--- mico.orig/coss/wireless/Makefile 2008-09-19 15:16:50 +0200 |
1074 |
+++ mico/coss/wireless/Makefile 2008-09-19 14:52:24 +0200 |
1075 |
@@ -21,15 +21,15 @@ |
1076 |
TARGETS = |
1077 |
|
1078 |
ifeq ($(USE_WIRELESS_HOME), yes) |
1079 |
-TARGETS := $(TARGETS) hla |
1080 |
+TARGETS := $(TARGETS) hla$(EXEEXT) |
1081 |
endif |
1082 |
|
1083 |
ifeq ($(USE_WIRELESS_TERMINAL), yes) |
1084 |
-TARGETS := $(TARGETS) tadmin tb |
1085 |
+TARGETS := $(TARGETS) tadmin$(EXEEXT) tb$(EXEEXT) |
1086 |
endif |
1087 |
|
1088 |
ifeq ($(USE_WIRELESS_ACCESS), yes) |
1089 |
-TARGETS := $(TARGETS) callback nadmin ab |
1090 |
+TARGETS := $(TARGETS) callback$(EXEEXT) nadmin$(EXEEXT) ab$(EXEEXT) |
1091 |
endif |
1092 |
|
1093 |
LDLIBS = $(LDMICOCOSS) $(LDMICO) $(CONFLIBS) |
1094 |
@@ -65,28 +65,28 @@ |
1095 |
|
1096 |
idlcompile: MobileTerminal.cc GTP.cc MobileTerminalNotification.cc |
1097 |
|
1098 |
-hla: $(HLA_OBJS) ../../orb/$(LIBMICO) |
1099 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(HLA_OBJS) $(LDLIBS) -o hla |
1100 |
+hla$(EXEEXT): $(HLA_OBJS) ../../orb/$(LIBMICO) |
1101 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(HLA_OBJS) $(LDLIBS) -o $@ |
1102 |
$(POSTLD) $@ |
1103 |
|
1104 |
-tb: $(TB_OBJS) ../../orb/$(LIBMICO) |
1105 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TB_OBJS) $(LDLIBS) -o tb |
1106 |
+tb$(EXEEXT): $(TB_OBJS) ../../orb/$(LIBMICO) |
1107 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TB_OBJS) $(LDLIBS) -o $@ |
1108 |
$(POSTLD) $@ |
1109 |
|
1110 |
-ab: $(AB_OBJS) ../../orb/$(LIBMICO) |
1111 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(AB_OBJS) $(LDLIBS) -o ab |
1112 |
+ab$(EXEEXT): $(AB_OBJS) ../../orb/$(LIBMICO) |
1113 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(AB_OBJS) $(LDLIBS) -o $@ |
1114 |
$(POSTLD) $@ |
1115 |
|
1116 |
-callback: $(CB_OBJS) ../../orb/$(LIBMICO) |
1117 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CB_OBJS) $(LDLIBS) -o callback |
1118 |
+callback$(EXEEXT): $(CB_OBJS) ../../orb/$(LIBMICO) |
1119 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(CB_OBJS) $(LDLIBS) -o $@ |
1120 |
$(POSTLD) $@ |
1121 |
|
1122 |
-tadmin: $(TAD_OBJS) ../../orb/$(LIBMICO) |
1123 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TAD_OBJS) $(LDLIBS) -o tadmin |
1124 |
+tadmin$(EXEEXT): $(TAD_OBJS) ../../orb/$(LIBMICO) |
1125 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(TAD_OBJS) $(LDLIBS) -o $@ |
1126 |
$(POSTLD) $@ |
1127 |
|
1128 |
-nadmin: $(NAD_OBJS) ../../orb/$(LIBMICO) |
1129 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NAD_OBJS) $(LDLIBS) -o nadmin |
1130 |
+nadmin$(EXEEXT): $(NAD_OBJS) ../../orb/$(LIBMICO) |
1131 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(NAD_OBJS) $(LDLIBS) -o $@ |
1132 |
$(POSTLD) $@ |
1133 |
|
1134 |
MobileTerminal.cc MobileTerminal.h: \ |
1135 |
diff -ru mico.orig/cpp/Makefile mico/cpp/Makefile |
1136 |
--- mico.orig/cpp/Makefile 2008-09-19 15:16:50 +0200 |
1137 |
+++ mico/cpp/Makefile 2008-09-19 14:52:24 +0200 |
1138 |
@@ -40,24 +40,24 @@ |
1139 |
|
1140 |
all: lib prg |
1141 |
|
1142 |
-prg: .depend mico-cpp |
1143 |
+prg: .depend mico-cpp$(EXEEXT) |
1144 |
|
1145 |
lib: .depend |
1146 |
|
1147 |
-mico-cpp: $(OBJS) |
1148 |
+mico-cpp$(EXEEXT): $(OBJS) |
1149 |
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@ |
1150 |
$(POSTLD) $@ |
1151 |
|
1152 |
# cleaning |
1153 |
|
1154 |
clean: |
1155 |
- -$(RM) *.o *.a *~ *.rpo mico-cpp |
1156 |
+ -$(RM) *.o *.a *~ *.rpo mico-cpp$(EXEEXT) |
1157 |
-$(RM) .depend TAGS core nohup.out $(GENERATED) |
1158 |
|
1159 |
|
1160 |
install: all |
1161 |
$(IDIRCMD) $(INSTDIR)/bin |
1162 |
- $(IBINCMD) mico-cpp $(INSTDIR)/bin |
1163 |
+ $(IBINCMD) mico-cpp$(EXEEXT) $(INSTDIR)/bin |
1164 |
|
1165 |
install-cd: install |
1166 |
|
1167 |
diff -ru mico.orig/daemon/Makefile mico/daemon/Makefile |
1168 |
--- mico.orig/daemon/Makefile 2008-09-19 15:16:50 +0200 |
1169 |
+++ mico/daemon/Makefile 2008-09-19 14:52:24 +0200 |
1170 |
@@ -38,13 +38,13 @@ |
1171 |
|
1172 |
all: prg |
1173 |
|
1174 |
-prg: .depend micod imr |
1175 |
+prg: .depend micod$(EXEEXT) imr$(EXEEXT) |
1176 |
|
1177 |
-micod: $(MICODOBJS) ../orb/$(LIBMICO) |
1178 |
+micod$(EXEEXT): $(MICODOBJS) ../orb/$(LIBMICO) |
1179 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(MICODOBJS) $(LDLIBS) -o $@ |
1180 |
$(POSTLD) $@ |
1181 |
|
1182 |
-imr: $(IMRCLOBJS) ../orb/$(LIBMICO) |
1183 |
+imr$(EXEEXT): $(IMRCLOBJS) ../orb/$(LIBMICO) |
1184 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) $(IMRCLOBJS) $(LDLIBS) -o $@ |
1185 |
$(POSTLD) $@ |
1186 |
|
1187 |
@@ -75,15 +75,15 @@ |
1188 |
# cleaning |
1189 |
|
1190 |
clean: |
1191 |
- -$(RM) micod imr |
1192 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid |
1193 |
+ -$(RM) micod$(EXEEXT) imr$(EXEEXT) |
1194 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.dll *.pdb *.exp |
1195 |
-$(RM) .depend TAGS core nohup.out |
1196 |
|
1197 |
|
1198 |
install: all |
1199 |
$(IDIRCMD) $(INSTDIR)/bin |
1200 |
- $(IBINCMD) micod $(INSTDIR)/bin |
1201 |
- $(IBINCMD) imr $(INSTDIR)/bin |
1202 |
+ $(IBINCMD) micod$(EXEEXT) $(INSTDIR)/bin |
1203 |
+ $(IBINCMD) imr$(EXEEXT) $(INSTDIR)/bin |
1204 |
|
1205 |
install-cd: install |
1206 |
|
1207 |
diff -ru mico.orig/idl/Makefile mico/idl/Makefile |
1208 |
--- mico.orig/idl/Makefile 2008-09-19 15:16:50 +0200 |
1209 |
+++ mico/idl/Makefile 2008-09-19 14:52:24 +0200 |
1210 |
@@ -56,7 +56,7 @@ |
1211 |
|
1212 |
all: lib prg |
1213 |
|
1214 |
-prg: .depend idl |
1215 |
+prg: .depend idl$(EXEEXT) |
1216 |
|
1217 |
lib: .depend libidl.a $(OBJS) |
1218 |
|
1219 |
@@ -71,8 +71,8 @@ |
1220 |
$(AR) $(ARFLAGS) $@ $(OBJS) |
1221 |
$(RANLIB) $@ |
1222 |
|
1223 |
-idl: libidl.a main.o ../orb/$(LIBMICO) ../ir/$(LIBMICOIR) $(IR_OBJS) |
1224 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) main.o $(IR_OBJS) $(LDLIBS) libidl.a -o idl |
1225 |
+idl$(EXEEXT): libidl.a main.o ../orb/$(LIBMICO) ../ir/$(LIBMICOIR) $(IR_OBJS) |
1226 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) main.o $(IR_OBJS) $(LDLIBS) libidl.a -o $@ |
1227 |
$(POSTLD) $@ |
1228 |
|
1229 |
main.o: |
1230 |
@@ -80,14 +80,14 @@ |
1231 |
# cleaning |
1232 |
|
1233 |
clean: |
1234 |
- -$(RM) idl idl.install |
1235 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid |
1236 |
+ -$(RM) idl$(EXEEXT) idl.install |
1237 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.dll *.pdb *.exp |
1238 |
-$(RM) .depend TAGS core nohup.out $(GENERATED) |
1239 |
|
1240 |
|
1241 |
install: all |
1242 |
$(IDIRCMD) $(INSTDIR)/bin |
1243 |
- $(IBINCMD) idl $(INSTDIR)/bin |
1244 |
+ $(IBINCMD) idl$(EXEEXT) $(INSTDIR)/bin |
1245 |
|
1246 |
install-cd: install |
1247 |
|
1248 |
diff -ru mico.orig/idl/params.cc mico/idl/params.cc |
1249 |
--- mico.orig/idl/params.cc 2008-09-19 15:16:50 +0200 |
1250 |
+++ mico/idl/params.cc 2008-09-19 14:52:24 +0200 |
1251 |
@@ -72,11 +72,13 @@ |
1252 |
cpp = "mico-cpp"; |
1253 |
#else // _WIN32 |
1254 |
cpp = "mico-cpp.exe"; |
1255 |
+#ifndef __PARITY__ |
1256 |
char sz_path[256] = ""; |
1257 |
GetModuleFileName(0, sz_path, 255); |
1258 |
string p(sz_path); |
1259 |
p.erase(p.find_last_of("\\") + 1, p.length()); |
1260 |
cpp = "\"" + p + cpp + "\""; |
1261 |
+#endif |
1262 |
#endif // _WIN32 |
1263 |
|
1264 |
base_dir = ""; |
1265 |
diff -ru mico.orig/ir/Makefile mico/ir/Makefile |
1266 |
--- mico.orig/ir/Makefile 2008-09-19 15:16:50 +0200 |
1267 |
+++ mico/ir/Makefile 2008-09-19 14:52:24 +0200 |
1268 |
@@ -57,17 +57,19 @@ |
1269 |
# mingw hack |
1270 |
|
1271 |
ifeq ($(OSTYPE), windows) |
1272 |
+ifneq ($(SUBOSTYPE), parity) |
1273 |
ifeq ($(HAVE_SHARED), yes) |
1274 |
HAVE_SHARED := no |
1275 |
HAVE_STATIC := yes |
1276 |
endif |
1277 |
endif |
1278 |
+endif |
1279 |
|
1280 |
# normal rules |
1281 |
|
1282 |
all: lib prg |
1283 |
|
1284 |
-prg: ird |
1285 |
+prg: ird$(EXEEXT) |
1286 |
|
1287 |
ifeq ($(HAVE_SHARED), yes) |
1288 |
ifeq ($(HAVE_STATIC), yes) |
1289 |
@@ -79,8 +81,8 @@ |
1290 |
lib: .depend libmicoir$(VERSION).a |
1291 |
endif |
1292 |
|
1293 |
-ird: main.o ../idl/libidl.a ../orb/$(LIBMICO) $(LIBMICOIR) |
1294 |
- $(CXX) $(CXXFLAGS) $(LDFLAGS) main.o -L. $(LDLIBS) ../idl/libidl.a -o ird |
1295 |
+ird$(EXEEXT): main.o ../idl/libidl.a ../orb/$(LIBMICO) $(LIBMICOIR) |
1296 |
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) main.o -L. $(LDLIBS) ../idl/libidl.a -o $@ |
1297 |
$(POSTLD) $@ |
1298 |
|
1299 |
libmicoir$(VERSION).$(SOEXT): $(SHARED_OBJS) |
1300 |
@@ -96,6 +98,7 @@ |
1301 |
$(LDSO) -o libmicoir$(VERSION) $(SHARED_OBJS) -L../libs $(LDMICO) $(PLATFORM_LIBS) |
1302 |
$(IDIRCMD) ../libs |
1303 |
cd ../libs; $(RM) $@; $(LN) ../ir/$@ . |
1304 |
+ test ! -f $@.dll || ( cd ../libs; $(RM) $@.dll; $(LN) ../ir/$@.dll . ) |
1305 |
|
1306 |
libmicoir$(VERSION).a: $(STATIC_OBJS) |
1307 |
ifeq ($(HAVE_REPO), yes) |
1308 |
@@ -155,18 +158,19 @@ |
1309 |
# cleaning |
1310 |
|
1311 |
clean: |
1312 |
- -$(RM) libs libmicoir* ird |
1313 |
- -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid |
1314 |
+ -$(RM) libs libmicoir* ird$(EXEEXT) |
1315 |
+ -$(RM) *.o *.o0 *.a *~ *.$(SOEXT) *.exe *.rpo *.ii *.ti *.objid *.dll *.pdb *.exp |
1316 |
-$(RM) .depend TAGS core nohup.out |
1317 |
|
1318 |
install: |
1319 |
$(IDIRCMD) $(INSTDIR)/bin |
1320 |
- $(IBINCMD) ird $(INSTDIR)/bin |
1321 |
+ $(IBINCMD) ird$(EXEEXT) $(INSTDIR)/bin |
1322 |
ifeq ($(HAVE_STATIC), yes) |
1323 |
$(ILIBCMD) libmicoir$(VERSION).a $(INSTDIR)/lib |
1324 |
endif |
1325 |
ifeq ($(HAVE_SHARED), yes) |
1326 |
$(ILIBCMD) libmicoir$(VERSION).$(SOEXT) $(INSTDIR)/lib |
1327 |
+ test ! -f libmicoir$(VERSION).$(SOEXT).dll || $(ILIBCMD) libmicoir$(VERSION).$(SOEXT).dll $(INSTDIR)/lib |
1328 |
endif |
1329 |
|
1330 |
install-cd: install |
1331 |
diff -ru mico.orig/orb/Makefile mico/orb/Makefile |
1332 |
--- mico.orig/orb/Makefile 2008-09-19 15:16:50 +0200 |
1333 |
+++ mico/orb/Makefile 2008-09-19 14:52:24 +0200 |
1334 |
@@ -207,14 +207,13 @@ |
1335 |
prg: |
1336 |
|
1337 |
ifeq ($(OSTYPE), windows) |
1338 |
+ifneq ($(SUBOSTYPE), parity) |
1339 |
ifeq ($(HAVE_SHARED), yes) |
1340 |
lib: .depend libmico$(VERSION).a mico$(NODOTVERSION).dll |
1341 |
else |
1342 |
lib: .depend libmico$(VERSION).a |
1343 |
endif |
1344 |
- |
1345 |
else |
1346 |
- |
1347 |
ifeq ($(HAVE_SHARED), yes) |
1348 |
ifeq ($(HAVE_STATIC), yes) |
1349 |
lib: .depend libmico$(VERSION).$(SOEXT) libmico$(VERSION).a |
1350 |
@@ -224,6 +223,20 @@ |
1351 |
else |
1352 |
lib: .depend libmico$(VERSION).a |
1353 |
endif |
1354 |
+ |
1355 |
+endif |
1356 |
+ |
1357 |
+else |
1358 |
+ |
1359 |
+ifeq ($(HAVE_SHARED), yes) |
1360 |
+ifeq ($(HAVE_STATIC), yes) |
1361 |
+lib: .depend libmico$(VERSION).$(SOEXT) libmico$(VERSION).a |
1362 |
+else |
1363 |
+lib: .depend libmico$(VERSION).$(SOEXT) |
1364 |
+endif |
1365 |
+else |
1366 |
+lib: .depend libmico$(VERSION).a |
1367 |
+endif |
1368 |
endif |
1369 |
|
1370 |
$(EH_STATIC_OBJS): |
1371 |
@@ -252,6 +265,10 @@ |
1372 |
$(LDSO) -o libmico$(VERSION) $(SHARED_OBJS) $(PLATFORM_LIBS) |
1373 |
$(IDIRCMD) ../libs |
1374 |
cd ../libs; $(RM) $@; $(LN) ../orb/$@ . |
1375 |
+ if test -f $@.dll; then \ |
1376 |
+ cd ../libs; $(RM) $@.dll; $(LN) ../orb/$@.dll .; \ |
1377 |
+ fi |
1378 |
+ |
1379 |
endif |
1380 |
|
1381 |
# static |
1382 |
@@ -412,7 +429,7 @@ |
1383 |
$(RM) -r orig |
1384 |
|
1385 |
clean: |
1386 |
- $(RM) *.rpo *.ii *.ti *.a *.o *~ *.$(SOEXT) *.exe .depend |
1387 |
+ $(RM) *.rpo *.ii *.ti *.a *.o *~ *.$(SOEXT) *.exe .depend *.dll *.pdb *.exp |
1388 |
(cd transport; $(RM) *.rpo *.ii *.ti *.a *.o *~ .depend) |
1389 |
(cd os-thread; $(RM) *.rpo *.ii *.ti *.a *.o *~ .depend) |
1390 |
(cd security; $(RM) *.rpo *.ii *.ti *.a *.o *~ .depend) |
1391 |
@@ -425,6 +442,7 @@ |
1392 |
endif |
1393 |
ifeq ($(HAVE_SHARED), yes) |
1394 |
$(ILIBCMD) libmico$(VERSION).$(SOEXT) $(INSTDIR)/lib |
1395 |
+ test ! -f libmico$(VERSION).$(SOEXT).dll || $(ILIBCMD) libmico$(VERSION).$(SOEXT).dll $(INSTDIR)/lib |
1396 |
endif |
1397 |
|
1398 |
install-cd: install |
1399 |
diff -ru mico.orig/orb/orb_all.cc mico/orb/orb_all.cc |
1400 |
--- mico.orig/orb/orb_all.cc 2008-09-19 15:16:50 +0200 |
1401 |
+++ mico/orb/orb_all.cc 2008-09-19 14:52:24 +0200 |
1402 |
@@ -26,7 +26,11 @@ |
1403 |
#include "codeset.cc" |
1404 |
#include "queue.cc" |
1405 |
#include "static.cc" |
1406 |
+#ifndef _WIN32 |
1407 |
#include "os-unix.cc" |
1408 |
+#else |
1409 |
+#include "os-windows.cc" |
1410 |
+#endif |
1411 |
#include "ssl.cc" |
1412 |
#include "current.cc" |
1413 |
#include "valuetype.cc" |
1414 |
diff -ru mico.orig/tools/iordump/Makefile mico/tools/iordump/Makefile |
1415 |
--- mico.orig/tools/iordump/Makefile 2008-09-19 15:16:50 +0200 |
1416 |
+++ mico/tools/iordump/Makefile 2008-09-19 14:52:24 +0200 |
1417 |
@@ -34,15 +34,15 @@ |
1418 |
|
1419 |
# normal rules |
1420 |
|
1421 |
-all: .depend iordump |
1422 |
+all: .depend iordump$(EXEEXT) |
1423 |
|
1424 |
-iordump: $(OBJS) ../../orb/$(LIBMICO) |
1425 |
+iordump$(EXEEXT): $(OBJS) ../../orb/$(LIBMICO) |
1426 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) -L../../idl $(OBJS) -lidl $(LDLIBS) -o $@ |
1427 |
$(POSTLD) $@ |
1428 |
|
1429 |
install: |
1430 |
$(IDIRCMD) $(INSTDIR)/bin |
1431 |
- $(IBINCMD) iordump $(INSTDIR)/bin |
1432 |
+ $(IBINCMD) iordump$(EXEEXT) $(INSTDIR)/bin |
1433 |
|
1434 |
# cleaning |
1435 |
|
1436 |
|
1437 |
|
1438 |
|
1439 |
1.1 src/patchsets/mico/9999/gtk-config |
1440 |
|
1441 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/gtk-config?rev=1.1&view=markup |
1442 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/mico/9999/gtk-config?rev=1.1&content-type=text/plain |
1443 |
|
1444 |
Index: gtk-config |
1445 |
=================================================================== |
1446 |
#!/bin/sh |
1447 |
exec pkg-config gtk+-2.0 $(printf "%s" "$*" | sed s:--version:--modversion:) |