Mercurial > audlegacy
changeset 3657:e83412963c51
More implib stuff.
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Thu, 27 Sep 2007 21:36:43 +0200 |
| parents | db04d0916c22 |
| children | 00549db12332 |
| files | buildsys.mk.in configure.ac extra.mk.in m4/buildsys.m4 src/audacious/Makefile src/libid3tag/Makefile |
| diffstat | 6 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/buildsys.mk.in Thu Sep 27 21:25:58 2007 +0200 +++ b/buildsys.mk.in Thu Sep 27 21:36:43 2007 +0200 @@ -211,7 +211,7 @@ for i in ${STATIC_LIB}; do \ ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i; then \ + if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ ${INSTALL_OK}; \ else \ ${INSTALL_FAILED}; \
--- a/configure.ac Thu Sep 27 21:25:58 2007 +0200 +++ b/configure.ac Thu Sep 27 21:36:43 2007 +0200 @@ -157,6 +157,12 @@ dnl Ok, first we find out what flags we need to use. BUILDSYS_PROG_IMPLIB BUILDSYS_SHARED_LIB +if test x"$PROG_IMPLIB_NEEDED" = x"yes"; then + IMPLIB_LIBS='-L../audacious -laudacious.exe' +else + IMPLIB_LIBS='' +fi +AC_SUBST(IMPLIB_LIBS) dnl XXX SHARED_SUFFIX=$PLUGIN_SUFFIX
--- a/extra.mk.in Thu Sep 27 21:25:58 2007 +0200 +++ b/extra.mk.in Thu Sep 27 21:36:43 2007 +0200 @@ -340,3 +340,4 @@ TRANSPORT_PLUGINS ?= @TRANSPORT_PLUGINS@ PCH ?= @PCH@ EXPORTDYN ?= @EXPORTDYN@ +IMPLIB_LIBS = @IMPLIB_LIBS@
--- a/m4/buildsys.m4 Thu Sep 27 21:25:58 2007 +0200 +++ b/m4/buildsys.m4 Thu Sep 27 21:36:43 2007 +0200 @@ -23,12 +23,12 @@ case "$target" in *-*-cygwin | *-*-mingw32) AC_MSG_RESULT(yes) - PROG_IMPLIB_NEEDED=1 + PROG_IMPLIB_NEEDED='yes' PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a' ;; *) AC_MSG_RESULT(no) - PROG_IMPLIB_NEEDED=0 + PROG_IMPLIB_NEEDED='no' PROG_IMPLIB_LDFLAGS='' ;; esac
--- a/src/audacious/Makefile Thu Sep 27 21:25:58 2007 +0200 +++ b/src/audacious/Makefile Thu Sep 27 21:36:43 2007 +0200 @@ -217,15 +217,7 @@ ${DBUS_BINDING_TOOL} --mode=glib-client --prefix=audacious_rc objects.xml > $@ install-extra: - for i in audacious.desktop; do \ - ${INSTALL_STATUS}; \ - if ${MKDIR_P} ${DESTDIR}${libdir} && install -m 644 $$i ${DESTDIR}${datadir}/applications/$$i; then \ - ${INSTALL_OK}; \ - else \ - ${INSTALL_FAILED}; \ - fi \ - done - if test x"${PROG_NEED_IMPLIB}" = x"1"; then \ + if test x"${PROG_NEED_IMPLIB}" = x"yes"; then \ for i in ${LIB}; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${libdir} && install -m 644 $$i ${DESTDIR}${libdir}/$$i; then \