Revert "Compile shared library by default"

[orte.git] / Makefile.git

diff --git a/Makefile.git b/Makefile.git
index 547e3026693cb91a1ae81cf19a707f56d8fce7e2..a575b1ffbe4ac1a2e93d7f971d6443deb08d05a5 100644 (file)
--- a/Makefile.git
+++ b/Makefile.git
@@ -19,7 +19,7 @@ CONFIGURE_FLAGS = --enable-orte-idl
 configure: git
 
 check: configure
-       $(MAKE) -f Makefile.git check-windows check-autotools check-java check-android
+       $(MAKE) -f Makefile.git check-omk check-autotools check-windows check-windows-omk check-java check-android
 
 check-%:
        rm -rf _$@
@@ -34,6 +34,18 @@ check-windows.real:
        make install DESTDIR=$(CURDIR)/_install
        test -f _install/bin/liborte-*.dll
 
+check-windows-omk.real:
+       echo "TARGET_OS=win32" > config.omk
+       echo "CC=i686-w64-mingw32-gcc" >> config.omk
+       echo "CXX=i686-w64-mingw32-g++" >> config.omk
+       echo "AR=i686-w64-mingw32-ar" >> config.omk
+       echo "LD=i686-w64-mingw32-ld" >> config.omk
+       ln -s ../orte ../Makefile ../Makefile.omk ../Makefile.rules .
+       make
+
+check-omk.real:
+       ln -s ../orte ../Makefile ../Makefile.omk ../Makefile.rules .
+       make
 
 check-autotools.real:
        ../configure $(CONFIGURE_FLAGS)
@@ -56,7 +68,7 @@ check-android:
        test -f orte/contrib/Robot_Demo/bin/RoboDruid-debug.apk
 
 dist:
-       $(MAKE) VER=$(VER) dist-tarball dist-check
+       $(MAKE) -f Makefile.git VER=$(VER) dist-tarball dist-check
        @echo "Tarball stored as orte-$(VER).tar.gz"
 
 dist-tarball: orte-$(VER).tar.gz
@@ -65,7 +77,7 @@ orte-$(VER).tar.gz: $(shell git ls-files)
 # Export clean sources and run autoreconf
        test ! -d orte-$(VER)
        git archive --format=tar --prefix=orte-$(VER)/ HEAD | tar x
-       make -C orte-$(VER) -f Makefile.cvs
+       make -C orte-$(VER) -f Makefile.git
        rm -rf orte-$(VER)/autom4te.cache
 # Export sources again for building of documentation and copy generated orte manual to release dir
        test ! -d orte-$(VER)-doc
@@ -84,5 +96,5 @@ dist-check: orte-$(VER).tar.gz
        mkdir orte-$(VER)/_build
        cd orte-$(VER)/_build && ../configure $(CONFIGURE_FLAGS) && make V=0
        mkdir orte-$(VER)/_win
-       cd orte-$(VER)/_win && ../configure --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc $(CONFIGURE_FLAGS) && make V=0
+       cd orte-$(VER)/_win && ../configure --host=i686-w64-mingw32 CC=i686-w64-mingw32-gcc && make V=0
        rm -rf orte-$(VER)