* fixed compilation warning

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 14c9e1736bb04404dc2107a096ebb5a1e3d92d73..c9a6dc67d2b1b7e0bf39ae953ea8a49158fb0f37 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ EXTRA_DIST = \
        src/misc/modules_builtin.h.in \
        $(NULL)
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean = vlc-config compile
 BUILT_SOURCES_clean = \
        stamp-api \
        src/misc/modules_builtin.h \
@@ -69,6 +69,7 @@ dist_pkginclude_HEADERS = \
        include/vlc/input.h \
        include/vlc/intf.h \
        include/vlc/control.h \
+       include/vlc/control_structures.h \
        $(NULL)
 
 noinst_HEADERS = $(HEADERS_include)
@@ -445,6 +446,7 @@ SOURCES_libvlc_common = \
        src/network/tcp.c \
        src/network/udp.c \
        src/network/httpd.c \
+       src/network/rootwrap.c \
        src/network/tls.c \
        src/misc/charset.c \
        src/misc/md5.c \
@@ -471,6 +473,9 @@ SOURCES_libvlc_common = \
        src/control/audio_video.c \
        $(NULL)
 
+# These should be distributed, but not compiled
+EXTRA_DIST += src/control/init.c src/control/plugin.c
+
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -581,8 +586,6 @@ VLC-release.app: vlc
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
-       cp $(srcdir)/modules/audio_output/coreaudio.c \
-          $(top_builddir)/tmp/modules/audio_output/coreaudio.c
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
            about.h \
@@ -688,8 +691,6 @@ VLC.app: vlc
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
-       cp $(srcdir)/modules/audio_output/coreaudio.c \
-          $(top_builddir)/tmp/modules/audio_output/coreaudio.c
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
            about.h \
@@ -906,13 +907,19 @@ endif
 
 package-win32-base-exe:
 # Create package
-       wine C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+       if [ -x makensis ]; then \
+           MAKENSIS=makensis; \
+       elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
+       elif [ -x wine ]; then \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
+       else \
+           echo 'Error: cannot locate makensis tool'; exit 1; \
+       fi; \
+       eval "$$MAKENSIS /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
 
-package-win32-base-exe-cygwin:
+package-win32-base-exe-cygwin: package-win32-base-exe
 # Create package
-       C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-exe-linux:
 # Create package