* libvlc.h: hopefully fix a few warnings.

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index d1c17f01d55d1bcfc8fd41d4f1cbd717ab4b5dc2..ba8fb9655e0ee0da1d2fbc49b7b42233c6fe0356 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-
+###############################################################################
 # Automake targets and declarations
 ###############################################################################
 
@@ -7,10 +7,10 @@ AUTOMAKE_OPTIONS = subdir-objects
 NULL =
 SUBDIRS =
 
-EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
 BUILT_SOURCES = $(CLEANFILES)
-CLEANFILES = misc/modules_builtin.h
+CLEANFILES = modules/builtin.h misc/revision.c
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 
 TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -24,6 +24,7 @@ pkgincludedir = $(includedir)/vlc
 dist_pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
        ../include/vlc/libvlc.h \
+       ../include/vlc/libvlc_structures.h \
        ../include/vlc/mediacontrol.h \
        ../include/vlc/mediacontrol_structures.h \
        $(NULL)
@@ -90,22 +91,24 @@ HEADERS_include = \
        ../include/vlc_vout_synchro.h \
        $(NULL)
 
-misc/modules_builtin.h: misc/modules_builtin.h.in
+modules/builtin.h: modules/builtin.h.in
        $(TOOLBOX) --update-includes
        touch $@
 
-misc/modules.c: misc/modules_builtin.h
+modules/modules.c: modules/builtin.h
 
 ###############################################################################
 # Building libvlc
 ###############################################################################
 
 libvlc_a_SOURCES = $(SOURCES_libvlc) $(SOURCES_libvlc_control)
+nodist_libvlc_a_SOURCES = misc/revision.c
 libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags libvlc pic` -DUSE_BUILTINS
 libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc pic`
 libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc pic`
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_LIBADD = $(INCLUDED_LIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
@@ -147,12 +150,6 @@ else
 lib_LIBRARIES = libvlc.a
 endif
 
-if HAVE_WIN32
-pic =
-else
-pic = pic
-endif
-
 if HAVE_WIN32
 DATA_noinst_libvlc = libvlc$(LIBEXT) libvlc$(LIBEXT).a
 
@@ -170,8 +167,7 @@ libvlc$(LIBEXT): $(libvlc_a_OBJECTS)
        $$ld $(libvlc_a_OBJECTS) \
                $$ldfl
 # It sucks big time, but we have to do that to link vlc properly
-# on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
-# libvlc$(LIBEXT)
+# on non-PIC OSes, otherwise ld will favor libvlc.a over libvlc$(LIBEXT)
        rm -f libvlc.a
 # Cygwin libtool work-around
        @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
@@ -286,14 +282,15 @@ SOURCES_libvlc_common = \
        misc/md5.c \
        misc/mtime.c \
        misc/block.c \
-       misc/modules.h \
-       misc/modules.c \
+       modules/modules.h \
+       modules/modules.c \
+       modules/entry.c \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       misc/configuration.h \
-       misc/configuration.c \
-       misc/configuration_chain.c \
+       modules/configuration.h \
+       modules/configuration.c \
+       modules/configuration_chain.c \
        misc/image.c \
        misc/messages.c \
        misc/objects.c \
@@ -325,6 +322,7 @@ SOURCES_libvlc_control = \
        control/input.c \
        control/video.c \
        control/audio.c \
+       control/callback.c \
        control/mediacontrol_internal.h \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
@@ -332,11 +330,6 @@ SOURCES_libvlc_control = \
 
 if !USE_LIBTOOL
 if !HAVE_WIN32
-nodist_libvlc_a_SOURCES = misc/version.c
-CLEANFILES += misc/version.c
-
-misc/version.c: FORCE
-       $(TOOLBOX) --update-version
 endif
 
 # Install shared libvlc
@@ -363,6 +356,13 @@ CLEANFILES += stamp-api
 endif
 endif
 
+misc/revision.c:
+       rm -f $@ $@.tmp
+       echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
+       REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \
+       echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
+       mv -f $@.tmp $@
+
 ###############################################################################
 # Unit/regression test
 ###############################################################################
@@ -373,8 +373,7 @@ endif
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
-test_i18n_atof_SOURCES = test/i18n_atof.c
-test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)
 
 test_url_SOURCES = test/url.c
@@ -386,3 +385,7 @@ test_utf8_LDADD = libvlc.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
 
 FORCE:
+       @echo "Generated source cannot be phony. Go away." >&2
+       @exit 1
+
+.PHONY: FORCE