* No longer use the $(pic) variable, since all flags are properly set

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 942e4ed9720f0c2c4546a9baec0294f554dd7163..ac7e5df4b25eaf6d2eb3a595e59282c150c39c03 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,6 +83,7 @@ HEADERS_include = \
        ../include/vlc_input.h \
        ../include/vlc_interaction.h \
        ../include/vlc_interface.h \
+       ../include/vlc_intf_strings.h \
        ../include/vlc_keys.h \
        ../include/vlc_messages.h \
        ../include/vlc_meta.h \
@@ -148,18 +149,17 @@ endif
 ###############################################################################
 
 libvlc_a_SOURCES = $(SOURCES_libvlc)
-libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc $(pic)`
-libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc $(pic)`
-libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc $(pic)`
+libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
+libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
+libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` \
-               -avoid-version -no-undefined
-libvlc_la_DEPENDENCIES = stamp-builtins
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin|sed -e 's/\(modules\/[^ ]*\)\.a /\1_builtin.la /g'` -no-undefined -export-symbols libvlc.sym
+libvlc_la_DEPENDENCIES = stamp-builtins stamp-api
 
 
 if HAVE_BEOS
@@ -188,6 +188,12 @@ else
 lib_LIBRARIES = libvlc.a
 endif
 
+if HAVE_WIN32
+pic =
+else
+pic = pic
+endif
+
 if HAVE_WIN32
 if BUILD_SHARED
 DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
@@ -197,7 +203,7 @@ libvlc.dll.a: libvlc$(LIBEXT)
        $(DLLTOOL) --export-all-symbols -l $@ -D $< $(libvlc_a_OBJECTS)
 
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
-       @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin $(pic)` $(INCLUDED_LIBINTL)" ; \
+       @ldfl="`$(VLC_CONFIG) --libs plugin vlc builtin pic` $(INCLUDED_LIBINTL)" ; \
        case `$(VLC_CONFIG) --linkage vlc builtin` in \
          c++)  ld="$(CXXLINK)" ;; \
          objc) ld="$(OBJCLINK)" ;; \
@@ -250,6 +256,7 @@ SOURCES_libvlc_common = \
        interface/interface.c \
        interface/intf_eject.c \
        interface/interaction.c \
+       playlist/playlist_internal.h \
        playlist/thread.c \
        playlist/control.c \
        playlist/engine.c \
@@ -325,7 +332,7 @@ SOURCES_libvlc_common = \
        misc/update.c \
        misc/vlm.c \
        misc/xml.c \
-       misc/hashtables.c \
+       misc/dict.c \
        misc/devices.c \
        extras/libc.c \
        control/core.c \
@@ -377,6 +384,10 @@ stamp-api: Makefile.in $(HEADERS_include) ../vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
+libvlc.sym:
+       rm -f stamp-api
+       $(MAKE) stamp-api
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################