* modules/mux/mpeg/*: should fix builtin compilation

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 81272a83430960d2f997ca89dbea4f3c21b16bf9..fdd47a77f592449e6cf22372d89b5db664b3a379 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 SUBDIRS = po intl m4 share
 DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
 
-EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
+EXTRA_DIST = FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
              INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
              Modules.am macosx-dmg \
              configure.ac.in mkinstalldirs bootstrap
@@ -268,25 +268,25 @@ EXTRA_DIST += \
        $(NULL)
 
 ###############################################################################
-# MS Visual Studio project
+# MS Visual Studio and eMbedded Visual Studio projects
 ###############################################################################
 
 EXTRA_DIST += \
-       msvc/vlc.dsp \
        msvc/vlc.dsw \
+       msvc/libvlc.dsp.in \
+       msvc/plugins.dsp.in \
        msvc/vlc.dsp.in \
-       msvc/vlc.dsp.out \
-       msvc/vlc.vcp \
-       msvc/vlc.vcw \
-       msvc/vlc.vcp.in \
-       msvc/vlc.vcp.out \
        msvc/config.h \
        msvc/modules_builtin_msvc.h \
+       evc/vlc.vcw \
+       evc/libvlc.vcp.in \
+       evc/vlc.vcp.in \
+       evc/plugins.vcp.in \
+       evc/vlc.c \
+       evc/config.h \
+       evc/modules_builtin_evc.h \
        $(NULL)
 
-show-vlc-sources: FORCE
-       @echo X: $(vlc_SOURCES)
-
 show-libvlc-sources: FORCE
        @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
 
@@ -479,7 +479,7 @@ 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
-       $(WINDRES) -i $< -o $@
+       $(WINDRES) --include-dir share -i $< -o $@
 endif
 
 ###############################################################################
@@ -558,7 +558,7 @@ DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
 noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT)
 noinst_mozilla_npvlc_rcdir = $(libdir)
 mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
-       $(WINDRES) -i $< -o $@
+       $(WINDRES) --include-dir mozilla -i $< -o $@
 endif
 endif