Fix typo in Windows build system

loongson-zjl · Mar 2, 2012 · 945ded1 · 945ded1
1 parent 0ba66d8
commit 945ded1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/configure b/configure
@@ -4041,15 +4041,15 @@ $as_echo "win32" >&6; }
 
    LIBS="$LIBS -lwsock32 -lws2_32"
 
-   if test x$"LIB_MOWGLI_SHARED_MODULES" = x"yes"; then :
+   if test x$"LIBMOWGLI_SHARED_MODULES" = x"yes"; then :
 
-      LIBMOWGLI_SHARED_MODULES += "platform/win32/mowgli.platform.win32.lib.a"
+      LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
 
 fi
 
-   if test x$"LIB_MOWGLI_SHARED_MODULES" = x"yes"; then :
+   if test x$"LIBMOWGLI_STATIC_MODULES" = x"yes"; then :
 
-      LIBMOWGLI_SHARED_MODULES += "platform/win32/mowgli.platform.win32.a"
+      LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
 
 fi
    ;;

diff --git a/configure.ac b/configure.ac
@@ -65,12 +65,12 @@ case "$target" in
 
    LIBS="$LIBS -lwsock32 -lws2_32"
 
-   AS_IF([test x$"LIB_MOWGLI_SHARED_MODULES" = x"yes"], [
-      LIBMOWGLI_SHARED_MODULES += "platform/win32/mowgli.platform.win32.lib.a"
+   AS_IF([test x$"LIBMOWGLI_SHARED_MODULES" = x"yes"], [
+      LIBMOWGLI_SHARED_MODULES="$LIBMOWGLI_SHARED_MODULES platform/win32/mowgli.platform.win32.lib.a"
    ])
 
-   AS_IF([test x$"LIB_MOWGLI_SHARED_MODULES" = x"yes"], [
-      LIBMOWGLI_SHARED_MODULES += "platform/win32/mowgli.platform.win32.a"
+   AS_IF([test x$"LIBMOWGLI_STATIC_MODULES" = x"yes"], [
+      LIBMOWGLI_STATIC_MODULES="$LIBMOWGLI_STATIC_MODULES platform/win32/mowgli.platform.win32.a"
    ])
    ;;
 *)

diff --git a/src/libmowgli/Makefile b/src/libmowgli/Makefile
@@ -12,6 +12,6 @@ include ../../buildsys.mk
 LIBS += ${PTHREAD_LIBS}
 CPPFLAGS += -I. -I../.. -DMOWGLI_CORE
 
-LIB_OBJS += ${LIBMOWGLI_SHARED_MODULES}
+LIB_OBJS := ${LIB_OBJS} ${LIBMOWGLI_SHARED_MODULES}
 OBJS += ${LIBMOWGLI_STATIC_MODULES}