* ./include/vlc/vlc.h, ./src/libvlc.c: added VLC_Error() to the libvlc API.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 69f5f06225e2f24025ad4454ca970360f01e0cae..78dfa42a919df9ddb2ddd54bee4fc42c825c58c4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,6 +29,10 @@ noinst_HEADERS =
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
+# XXX: these flags could be set in configure.ac.in, but we set them here
+# because old versions of automake don't support them in configure.ac.
+AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+
 ###############################################################################
 # Compilation flags for debug mode, profiling, and others
 ###############################################################################
@@ -151,6 +155,7 @@ HEADERS_include = \
        include/beos_specific.h \
        include/configuration.h \
        include/darwin_specific.h \
+       include/error.h \
        include/input_ext-dec.h \
        include/input_ext-intf.h \
        include/input_ext-plugins.h \
@@ -167,6 +172,7 @@ HEADERS_include = \
        include/os_specific.h \
        include/stream_control.h \
        include/stream_output.h \
+       include/variables.h \
        include/video.h \
        include/video_output.h \
        include/vlc_common.h \
@@ -217,6 +223,10 @@ endif
        echo "" >> $@.tmp
        mv -f $@.tmp $@
 
+# These dependencies are mandatory
+$(SOURCES): include/vlc_symbols.h
+$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h
+
 ###############################################################################
 # Optional getopt
 ###############################################################################
@@ -288,9 +298,6 @@ EXTRA_DIST += \
        src/misc/darwin_specific.c \
        src/misc/win32_specific.c
 
-BUILT_SOURCES += \
-       src/misc/modules_builtin.h
-
 SOURCES_libvlc = \
        src/libvlc.c \
        src/libvlc.h \
@@ -321,7 +328,6 @@ SOURCES_libvlc = \
        src/stream_output/stream_output.c \
        src/misc/mtime.c \
        src/misc/modules.c \
-       src/misc/modules_plugin.h \
        src/misc/threads.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
@@ -330,6 +336,8 @@ SOURCES_libvlc = \
        src/misc/iso-639.def \
        src/misc/messages.c \
        src/misc/objects.c \
+       src/misc/variables.c \
+       src/misc/error.c \
        src/misc/extras.c \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_beos) \
@@ -346,11 +354,14 @@ vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt)
 # @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin)
 # but we don't write it directly, otherwise automake will go amok and eat all
 # the memory because of its 2^N crap algorithm. So we fool him. Nuahaha.
-vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(noinst_share_vlc_win32_rc_DATA) @AUTOMAKE_SUCKS@
-vlc_DEPENDENCIES = lib/libvlc.a $(L_builtin)
+vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) $(DATA_win32_rc) @AUTOMAKE_SUCKS@
 vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
 
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
+# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
+# old automake-1.5 bug (automake/279).
+DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc)
+
+vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
        $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
 if HAVE_BEOS
@@ -381,6 +392,7 @@ vlc.app: vlc
 endif
 
 if HAVE_WIN32
+DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
 noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
 noinst_share_vlc_win32_rcdir = $(libdir)
 share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
@@ -420,6 +432,7 @@ mozilla_libvlcplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
 mozilla_libvlcplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic)
 
 BUILT_SOURCES_mozilla = mozilla/vlcintf.h
+$(SOURCES_mozilla): mozilla/vlcintf.h
 
 mozilla_libvlcplugin_DATA = mozilla/libvlcplugin$(LIBEXT)
 mozilla_libvlcplugindir = $(libdir)/mozilla/plugins