]> git.sesse.net Git - vlc/commitdiff
Fix linking with included gettext
authorRémi Denis-Courmont <rem@videolan.org>
Thu, 23 Feb 2006 10:41:15 +0000 (10:41 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Thu, 23 Feb 2006 10:41:15 +0000 (10:41 +0000)
Makefile.am

index 17dff0dd98fabf437d35a0fc902891b491cc74d8..78fc12d4b406329d39f931a498a00435c9d1e7fe 100644 (file)
@@ -222,8 +222,8 @@ vlc_WORKAROUNDLDFLAGS = $(LIB_libvlc)
 endif
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS)
-vlc_LDADD = $(DATA_win32_rc) $(INCLUDED_LIBINTL)
+vlc_LDFLAGS = $(LDFLAGS_libvlc) $(vlc_WORKAROUNDLDFLAGS) $(INCLUDED_LIBINTL)
+vlc_LDADD = $(DATA_win32_rc)
 
 # We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
 # old automake-1.5 bug (automake/279).
@@ -250,7 +250,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
          objc) cmd="$(OBJCLINK)" ;; \
          c|*) cmd="$(LINK)" ;; \
        esac ; \
-       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS)" ; \
+       cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
        echo $$cmd ; \
        eval $$cmd