ChangeLogTag:Sat Jun 2 13:05:20 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>

3 files changed, 29 insertions, 20 deletions

diff --git a/include/makeinclude/platform_gnuwin32_common.GNU b/include/makeinclude/platform_gnuwin32_common.GNU
index 412420bf95a..aee06d0ed29 100644
--- a/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/include/makeinclude/platform_gnuwin32_common.GNU
@@ -49,20 +49,28 @@ ifeq ($(debug),0)
 CFLAGS += -DNDEBUG
 endif
 
-CC      = gcc -m$(TCPU)
-CXX     = g++ -m$(TCPU)
+CC      = gcc
+CXX     = g++
+
+MODEL_FLAGS += -m$(TCPU)
 
 # Never use -pipe with 95/98. On NT/2000, not sure if it helps.
 CFLAGS  += -W -Wall -Wpointer-arith
 ifeq ($(threads),1)
-    CC      += -mthreads
-    CXX     += -mthreads
+        MODEL_FLAGS += -mthreads
 endif # threads
 
+CFLAGS += $(MODEL_FLAGS)
+
+# Never use -pipe with 95/98. On NT/2000, not sure if it helps.
+CFLAGS  += -W -Wall -Wpointer-arith
+
 ifeq ($(IMPLICIT_TEMPLATES_FLAG),)
   IMPLICIT_TEMPLATES_FLAG=-fno-implicit-templates
 endif
 
+EXEEXT = .exe
+
 CCFLAGS += $(CFLAGS) $(IMPLICIT_TEMPLATES_FLAG)
 DCFLAGS += -g
 DLD     = $(CXX)
@@ -75,18 +83,26 @@ endif
 LIBS    += -lwsock32
 endif
 
-VSHDIR = .obj/
-
 OCFLAGS += -O3
-PIC        =
+PIC        = -DACE_OS_HAS_DLL=1
 AR         = ar
 ARFLAGS    = rsuv
 RANLIB     = ranlib
 SOEXT      = dll
-SOFLAGS    = $(CPPFLAGS)
+SOFLAGS    = $(MODEL_FLAGS) $(CPPFLAGS)
 SOBUILD    = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-# The sed below is a workaround to a bug in ld.
-SHLIBBUILD = dlltool --export-all --output-def $@.def --dllname $@ $(VSHOBJS1) && mv $@.def $@.def.old && sed 's/;.*$$//g' < $@.def.old > $@.def && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a -shared -o $@ $(LDFLAGS) $@.def $(VSHOBJS1) $(LIBS) && $(RM) $@.def.old $@.def
+
+# The sed below is to strip comments on the .def file,
+# to workaround to a bug in ld.
+SHLIBBUILD = \
+  $(RM) $(VSHDIR)/$@.def.old $(VSHDIR)/$@.def; \
+  dlltool --export-all --output-def $(VSHDIR)/$@.def --dllname $@ \
+    $(VSHOBJS1) \
+  && mv $(VSHDIR)/$@.def $(VSHDIR)/$@.def.old \
+  && sed 's/;.*$$//g' < $(VSHDIR)/$@.def.old > $(VSHDIR)/$@.def \
+  && $(SOLINK.cc) -Wl,--enable-auto-image-base -Wl,--out-implib,$@.a \
+    -shared -o $@ $(LDFLAGS) $(VSHDIR)/$@.def \
+    $(VSHOBJS1) $(ACE_SHLIBS) $(LIBS)
 
 ifeq ($(exceptions),1)
 SHLIBBUILD += \
diff --git a/include/makeinclude/platform_mingw32.GNU b/include/makeinclude/platform_mingw32.GNU
index ba2d31272df..800877565f8 100644
--- a/include/makeinclude/platform_mingw32.GNU
+++ b/include/makeinclude/platform_mingw32.GNU
@@ -1,13 +1,10 @@
 # $Id$
 
-#
 # This file should allow to build ACE for mingw32 with mingw tools.
 # Edit to change TCPU and M32_BASE below.
 #
 # Don't forget to define the ACE_ROOT environment variable!
-#
 
-#
 # mingw32 packages as distributed from sourceforge:
 # http://sourceforge.net/project/showfiles.php?group_id=2435&release_id=15084
 # See also http://www.mingw.org.
@@ -36,23 +33,19 @@
 #    with
 #    ... %{!shared:%{!mdll:c:/mingw32/lib/gcc-lib/mingw32/2.95.2/crt2%O%s}} ...
 #    or something similar depending on the location of your instalation).
-#
 
-#
 # Chose your target CPU (uncomment ONE of these).
-#
 TCPU = pentiumpro
 #TCPU = pentium
 #TCPU = i486
 #TCPU = i386
 
-#
 # Define here mingw32 instalation location.
 # These asumes no fancy hierachy, just all packages above unpacked on
 # the same base directory.
 # Optionally, you can define it as an environment variable, or set it
 # on your platform_macros.GNU before including this file.
-#
+
 ifndef MINGW_BASE
   MINGW_BASE = c:/live/local/mingw32
 endif
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index c6cce7274f6..c51d1e3ce84 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -177,7 +177,7 @@ ifeq (,$(LN_S))
   endif # ! WIN32
 endif # ! LN_S
 
-$(INSBIN)/%$(VAR) \
+$(INSBIN)/%$(VAR)$(EXEEXT) \
 $(INSINC)/ace% \
 $(INSLIB)/% \
 $(INSMAN)/man1/% \
@@ -221,7 +221,7 @@ clean.local:
 	-$(RM) -r SunWS_cache ir.out
 
 realclean.local: clean.local
-	-$(RM) $(BIN) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%.a) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2) $(BIN2:%=%_debug) $(BIN2:%=%_profile) $(BIN2:%=%_optimize) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
+	-$(RM) $(BIN:%=%$(EXEEXT)) $(BIN:%=%_debug$(EXEEXT)) $(BIN:%=%_profile$(EXEEXT)) $(BIN:%=%_optimize$(EXEEXT)) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%.a) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%) $(BIN2:%=%$(EXEEXT)) $(BIN2:%=%_debug$(EXEEXT)) $(BIN2:%=%_profile$(EXEEXT)) $(BIN2:%=%_optimize$(EXEEXT)) $(LIB2:%=%) $(LIB2:%=%_debug) $(LIB2:%=%_profile) $(LIB2:%=%_optimize) $(SHLIB2:%=%) $(SHLIB2:%=%_debug) $(SHLIB2:%=%_profile) $(SHLIB2:%=%_optimize) $(SHLIBA2:%=%)
 
 #----------------------------------------------------------------------------
 #       Dependency generation target