contrib: add -m64 flags for OSX

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3210814858e25d948affc0a0b2a3de336b7ba22d..e93961db7dc18ae02af2473031d645ce468246ca 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,6 +67,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_modules.h \
        ../include/vlc_mouse.h \
        ../include/vlc_mtime.h \
+       ../include/vlc_network.h \
        ../include/vlc_objects.h \
        ../include/vlc_picture.h \
        ../include/vlc_picture_fifo.h \
@@ -84,6 +85,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_subpicture.h \
        ../include/vlc_text_style.h \
        ../include/vlc_threads.h \
+       ../include/vlc_tls.h \
        ../include/vlc_url.h \
        ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
@@ -107,10 +109,8 @@ noinst_HEADERS = \
        ../include/vlc_iso_lang.h \
        ../include/vlc_keys.h \
        ../include/vlc_memory.h \
-       ../include/vlc_network.h \
        ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
-       ../include/vlc_tls.h \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
        ../include/vlc_vout_wrapper.h \
@@ -197,6 +197,7 @@ EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_darwin) \
        $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
+       $(SOURCES_libvlc_os2) \
        $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_httpd) \
        $(SOURCES_libvlc_sout) \
@@ -217,12 +218,16 @@ else
 if HAVE_SYMBIAN
 #libvlccore_la_SOURCES += $(SOURCES_libvlc_symbian)
 else
+if HAVE_OS2
+libvlccore_la_SOURCES += $(SOURCES_libvlc_os2)
+else
 libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
 endif
 endif
 endif
 endif
 endif
+endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -271,6 +276,16 @@ SOURCES_libvlc_symbian = \
        win32/plugin.c \
        $(NULL)
 
+SOURCES_libvlc_os2 = \
+       os2/dirs.c \
+       misc/atomic.c \
+       posix/filesystem.c \
+       posix/plugin.c \
+       os2/poll.c \
+       os2/thread.c \
+       os2/specific.c \
+       $(NULL)
+
 SOURCES_libvlc_other = \
        posix/dirs.c \
        misc/atomic.c \
@@ -466,24 +481,12 @@ SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(NULL)
 
-###############################################################################
-# libvlc pulse
-###############################################################################
-
-if HAVE_PULSE
-pkglib_LTLIBRARIES = libvlcpulse.la
-endif
-
-libvlcpulse_la_SOURCES = pulse/mainloop.c ../include/vlc_pulse.h
-libvlcpulse_la_CPPFLAGS = $(PULSE_CFLAGS)
-libvlcpulse_la_LIBADD = $(PULSE_LIBS) libvlccore.la
-libvlcpulse_la_LDFLAGS = -export-symbols-regex ^vlc_pa_ -no-undefined
-
 ###############################################################################
 # GIT revision
 ###############################################################################
 
 BUILT_SOURCES += stamp-revision
+MAINTAINERCLEANFILES = $(srcdir)/revision.txt $(srcdir)/revision.c
 
 $(srcdir)/revision.c: $(srcdir)/revision.txt
        $(AM_V_at)rm -f -- $@