remove unneeded includes

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 40d7aa4a88a765dde537b7947e13636ed2432197..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 \
@@ -661,15 +664,6 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/http/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm
-       for i in $(srcdir)/share/http/vlm/* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
-       done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin
-       for i in $(srcdir)/share/http/admin/* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
-       done ; \
-       $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/.access
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -697,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 \
@@ -877,25 +869,18 @@ package-win32-base:
        sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
        sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-       cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+       cp $(srcdir)/share/http/*.js $(top_builddir)/vlc-${VERSION}/http/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
        cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-       cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-       cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -922,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
@@ -981,25 +972,18 @@ package-wince-base:
        done
 
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-       cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+       cp $(srcdir)/share/http/*.js $(top_builddir)/vlc-${VERSION}/http/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
        cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-       cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-       cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;