httpd: remove commented out debug code

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f87581dbcd3244573cea9ef41bce8fa58e72e8af..842fc732db21e6b61e391ee1cd9eeb14368b9b60 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,6 +23,7 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pluginsinclude_HEADERS = \
        ../include/vlc_access.h \
+       ../include/vlc_addons.h \
        ../include/vlc_aout.h \
        ../include/vlc_aout_volume.h \
        ../include/vlc_arrays.h \
@@ -76,7 +77,7 @@ pluginsinclude_HEADERS = \
        ../include/vlc_probe.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
-       ../include/vlc_sql.h \
+       ../include/vlc_fingerprinter.h \
        ../include/vlc_sout.h \
        ../include/vlc_spu.h \
        ../include/vlc_stream.h \
@@ -107,7 +108,6 @@ noinst_HEADERS = \
        ../include/vlc_intf_strings.h \
        ../include/vlc_iso_lang.h \
        ../include/vlc_memory.h \
-       ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
        ../include/vlc_update.h \
        ../include/vlc_vod.h \
@@ -164,7 +164,7 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 lib_LTLIBRARIES = libvlccore.la
 
 AM_CPPFLAGS = $(INCICONV) $(IDN_CFLAGS) \
-       -DMODULE_STRING=\"main\" \
+       -DMODULE_STRING=\"core\" \
        -DLOCALEDIR=\"$(localedir)\" \
        -DPKGDATADIR=\"$(vlcdatadir)\" \
        -DPKGLIBDIR=\"$(vlclibdir)\"
@@ -179,11 +179,10 @@ endif
 
 libvlccore_la_SOURCES = $(SOURCES_libvlc)
 libvlccore_la_LDFLAGS = \
-       -no-undefined \
        $(LDFLAGS_libvlccore) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
-       -version-info 5:0:0
+       -version-info 7:0:0
 libvlccore_la_LIBADD = $(LIBS_libvlccore) \
        ../compat/libcompat.la \
        $(LTLIBINTL) $(LTLIBICONV) \
@@ -245,25 +244,25 @@ if ENABLE_VLM
 libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm)
 endif
 endif
-if BUILD_OSDMENU
-libvlccore_la_SOURCES += osd/osd.c
-AM_CPPFLAGS += -DOSDMENU
-endif
 
 SOURCES_libvlc_darwin = \
-       posix/darwin_dirs.c \
+       darwin/dirs.c \
        posix/filesystem.c \
        posix/plugin.c \
-       posix/thread.c \
+       darwin/thread.c \
        posix/timer.c \
-       posix/darwin_specific.c \
+       darwin/specific.c \
        posix/rand.c \
+       darwin/error.c \
+       darwin/netconf.c \
        $(NULL)
 
 SOURCES_libvlc_android = \
        android/dirs.c \
        android/thread.c \
+       android/error.c \
        posix/filesystem.c \
+       android/netconf.c \
        posix/plugin.c \
        posix/timer.c \
        posix/linux_cpu.c \
@@ -274,7 +273,9 @@ SOURCES_libvlc_android = \
 
 SOURCES_libvlc_linux = \
        posix/dirs.c \
+       posix/error.c \
        posix/filesystem.c \
+       posix/netconf.c \
        posix/plugin.c \
        posix/thread.c \
        posix/timer.c \
@@ -286,7 +287,9 @@ SOURCES_libvlc_linux = \
 
 SOURCES_libvlc_win32 = \
        win32/dirs.c \
+       win32/error.c \
        win32/filesystem.c \
+       win32/netconf.c \
        win32/plugin.c \
        win32/thread.c \
        win32/specific.c \
@@ -304,7 +307,9 @@ SOURCES_libvlc_symbian = \
 SOURCES_libvlc_os2 = \
        os2/getaddrinfo.c \
        os2/dirs.c \
+       darwin/error.c \
        os2/filesystem.c \
+       os2/netconf.c \
        os2/plugin.c \
        os2/thread.c \
        os2/specific.c \
@@ -313,7 +318,9 @@ SOURCES_libvlc_os2 = \
 
 SOURCES_libvlc_other = \
        posix/dirs.c \
+       posix/error.c \
        posix/filesystem.c \
+       posix/netconf.c \
        posix/thread.c \
        posix/timer.c \
        posix/plugin.c \
@@ -395,8 +402,6 @@ SOURCES_libvlc_common = \
        video_output/snapshot.c \
        video_output/snapshot.h \
        video_output/statistic.h \
-       video_output/postprocessing.c \
-       video_output/postprocessing.h \
        video_output/video_output.c \
        video_output/video_text.c \
        video_output/video_epg.c \
@@ -404,7 +409,6 @@ SOURCES_libvlc_common = \
        video_output/vout_subpictures.c \
        video_output/window.c \
        video_output/opengl.c \
-       video_output/osd_text.c \
        video_output/vout_intf.c \
        video_output/vout_internal.h \
        video_output/vout_control.h \
@@ -470,13 +474,13 @@ SOURCES_libvlc_common = \
        misc/update.c \
        misc/update_crypto.c \
        misc/xml.c \
-       misc/media_library.c \
        extras/libc.c \
        extras/tdestroy.c \
+       misc/addons.c \
        misc/filter.c \
        misc/filter_chain.c \
        misc/http_auth.c \
-       misc/sql.c \
+       misc/fingerprinter.c \
        misc/text_style.c \
        misc/subpicture.c \
        misc/subpicture.h \