X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=c9a6dc67d2b1b7e0bf39ae953ea8a49158fb0f37;hb=86310411f8ff771d2e4558d21e40f5bf1a1bf226;hp=f311dc22d4d2beed406c230a82fb363ea651c5f6;hpb=a67fd4f9c8b11883bf84a421d7c924a7b75f0ccd;p=vlc diff --git a/Makefile.am b/Makefile.am index f311dc22d4..c9a6dc67d2 100644 --- 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 \ @@ -44,6 +44,9 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = +DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ + --disable-ffmpeg --disable-faad --disable-skins2 + # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 @@ -66,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) @@ -112,6 +116,7 @@ HEADERS_include = \ include/vlc_md5.h \ include/vlc_image.h \ include/vlc_input.h \ + include/vlc_interaction.h \ include/vlc_interface.h \ include/vlc_keys.h \ include/vlc_messages.h \ @@ -249,7 +254,7 @@ EXTRA_DIST += \ extras/MacOSX/vlc.pbproj/project.pbxproj \ extras/MacOSX/macosx-dmg \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ - extras/MacOSX/Delete_Preferences.app/Contents/Pkginfo \ + extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \ @@ -297,7 +302,7 @@ vlc-config.in: vlc-config.in.in MOSTLYCLEANFILES = $(DATA_noinst_libvlc) CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin -DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in +DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile if HAVE_WIN32 lib_LIBRARIES = lib/libvlc.a @@ -393,6 +398,7 @@ SOURCES_libvlc_common = \ src/libvlc.h \ src/interface/interface.c \ src/interface/intf_eject.c \ + src/interface/interaction.c \ src/playlist/playlist.c \ src/playlist/sort.c \ src/playlist/loadsave.c \ @@ -430,14 +436,19 @@ SOURCES_libvlc_common = \ src/stream_output/stream_output.c \ src/stream_output/announce.c \ src/stream_output/sap.c \ - src/stream_output/acl.c \ src/osd/osd.c \ src/osd/osd_parser.c \ src/osd/osd_text.c \ src/osd/osd_widgets.c \ + src/network/acl.c \ + src/network/getaddrinfo.c \ + src/network/io.c \ + 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/httpd.c \ - src/misc/tls.c \ src/misc/md5.c \ src/misc/mtime.c \ src/misc/block.c \ @@ -453,8 +464,6 @@ SOURCES_libvlc_common = \ src/misc/objects.c \ src/misc/variables.c \ src/misc/error.c \ - src/misc/net.c \ - src/misc/getaddrinfo.c \ src/misc/vlm.c \ src/misc/xml.c \ src/misc/version.c \ @@ -464,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) \ @@ -545,7 +557,7 @@ endif install-exec-local: for i in "" $(ALIASES) ; do if test -n "$$i" ; then \ rm -f "$(DESTDIR)$(bindir)/$$i" && \ - ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \ + ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \ fi ; done test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)" @@ -574,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 \ @@ -654,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 ; \ @@ -690,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 \ @@ -870,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}/ ; @@ -915,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 @@ -974,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}/ ;