From b8d518dad6e927137dc76831b7694658366572cd Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Thu, 10 May 2012 01:13:45 +0200 Subject: fixed DLL building and Glade catalog on Windows * removed libtool -module flag: it should be used for dlopen libs (gtk-vlc-player is dlopened by Glade) but had no visible impact on building the library. also it prevented installation of the library into the bindir! * explicitly specify bindir for DLL installations (it may and will be set independently of the libdir but libtool assumes LIBDIR/../bin by default) * avoid-versioning. that way the DLL name is predictable - it must be known for the glade catalog which has been adapted to cover both the Linux and Windows shared library names. --- lib/gtk-vlc-player/Makefile.am | 3 ++- lib/gtk-vlc-player/gtk-vlc-player-catalog.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/gtk-vlc-player/Makefile.am b/lib/gtk-vlc-player/Makefile.am index 6ee70a5..467c630 100644 --- a/lib/gtk-vlc-player/Makefile.am +++ b/lib/gtk-vlc-player/Makefile.am @@ -8,7 +8,8 @@ libgtk_vlc_player_la_SOURCES = gtk-vlc-player.c gtk-vlc-player.h libgtk_vlc_player_la_CFLAGS = $(AM_CFLAGS) \ @LIBGTK_CFLAGS@ @LIBVLC_CFLAGS@ libgtk_vlc_player_la_LIBADD = @LIBGTK_LIBS@ @LIBVLC_LIBS@ -libgtk_vlc_player_la_LDFLAGS = -no-undefined -shared -module +libgtk_vlc_player_la_LDFLAGS = -no-undefined -shared -bindir @bindir@ \ + -avoid-version include_HEADERS = gtk-vlc-player.h diff --git a/lib/gtk-vlc-player/gtk-vlc-player-catalog.xml b/lib/gtk-vlc-player/gtk-vlc-player-catalog.xml index a5abdca..66b928e 100644 --- a/lib/gtk-vlc-player/gtk-vlc-player-catalog.xml +++ b/lib/gtk-vlc-player/gtk-vlc-player-catalog.xml @@ -4,7 +4,7 @@ Install into $GLADE_CATALOG_PATH (default: /usr/share/glade3/catalogs) --> - + - \ No newline at end of file + -- cgit v1.2.3