[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[658]

[<nic...@us...>]

Revision: 658
          http://sourceforge.net/p/mplayerxp/code/658
Author:   nickols_k
Date:     2013-08-26 16:14:58 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
use static linkage by default

Modified Paths:
--------------
    etc/Makefile
    mplayerxp/configure

Modified: etc/Makefile
===================================================================
--- etc/Makefile	2013-06-20 10:08:21 UTC (rev 657)
+++ etc/Makefile	2013-08-26 16:14:58 UTC (rev 658)
@@ -8,7 +8,6 @@
 distclean:
 	rm -f config.mak configure.log
 install:
-	$(INSTALL) -D -b -c -m 644 codecs.conf $(DESTDIR)$(CONFDIR)/codecs.conf
 	$(INSTALL) -D -b -c -m 644 menu.conf $(DESTDIR)$(CONFDIR)/menu.conf
 	$(INSTALL) -D -b -c -m 644 eqbands $(DESTDIR)$(CONFDIR)/eqbands
 uninstall:

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2013-06-20 10:08:21 UTC (rev 657)
+++ mplayerxp/configure	2013-08-26 16:14:58 UTC (rev 658)
@@ -36,7 +36,7 @@
 # and have - unless stated otherwise - at least 2 states : yes no
 # If autodetection is available then the third state is: auto
 ENABLED_LIST=(
-    "shared|build shared libraries",
+    "static|build static libraries",
     "gomp|use GNU OpenMP (requires gcc-4.3+)",
     "gpl_only|build only GPL code",
     "fastcall|use regparm method on x86 systems",
@@ -85,8 +85,8 @@
 DISABLED_LIST=(
     "gcov|compile gnu coverage information into PROGRAM",
     "profile|compile profiling information into PROGRAM",
-    "static|build static libraries",
     "dbg23|allow additional level of debug messages",
+    "shared|build shared libraries",
     "random_name|generates pseudo random suffix of target",
     "sdl|build with SDL video and audio output|http://www.libsdl.org",
     "sdl_image|build with SDL_image for screenshots|http://www.libsdl.org/projects/SDL_image",
@@ -335,6 +335,9 @@
 add_cflags "-Warray-bounds -Wreturn-type -Wuninitialized -Wlogical-op -Waddress"
 check_cflags "-W -Wall -Wextra"
 
+enabled static && add_ldflags="-static"
+enabled shared && add_ldflags="-shared"
+
 echocheck CFLAGS
 echores   $CFLAGS
 echocheck CXXFLAGS

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.