]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* dialogs.cpp: fixed an assert failure in open skins dialog
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 9a26b3d2e6950a8dc860760e474cc3fe8bbfaf32..d8e4d6415710fb567e23257486e3d4c5f3acb7af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla activex share m4 doc
+#  - loader should come before modules because some plugins need it
+SUBDIRS = intl loader modules po . mozilla activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
 
 EXTRA_DIST = \
@@ -87,6 +88,7 @@ HEADERS_include = \
        include/variables.h \
        include/video_output.h \
        include/vlc_access.h \
+       include/vlc_acl.h \
        include/vlc_bits.h \
        include/vlc_block.h \
        include/vlc_block_helper.h \
@@ -149,7 +151,7 @@ endif
 EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
+       extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
@@ -373,6 +375,7 @@ 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/misc/charset.c \
        src/misc/httpd.c \
        src/misc/tls.c \
@@ -381,6 +384,7 @@ SOURCES_libvlc_common = \
        src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
+       src/misc/unicode.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
        src/misc/image.c \
@@ -433,9 +437,9 @@ DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        @rm -f $(top_builddir)/vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \
-         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
        esac
 
 if HAVE_BEOS
@@ -557,13 +561,26 @@ VLC-release.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
-       cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-             $(top_builddir)/VLC-release.app
+       case $(target_triplet) in \
+         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+                 $(top_builddir)/VLC-release.app;; \
+         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+                 $(top_builddir)/VLC-release.app;; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+                 $(top_builddir)/VLC-release.app;; \
+       esac
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/vlc \
@@ -656,13 +673,26 @@ VLC.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
-       cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
-             $(top_builddir)/VLC.app
+       case $(target_triplet) in \
+         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+                 $(top_builddir)/VLC.app;; \
+         *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+                 $(top_builddir)/VLC.app;; \
+         *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
+           cd ../../../; \
+           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+                 $(top_builddir)/VLC.app;; \
+       esac
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/vlc \
@@ -702,6 +732,7 @@ share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
        $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
 endif
 
+
 ###############################################################################
 # Building specific source packages
 ###############################################################################
@@ -803,8 +834,8 @@ endif
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
 if BUILD_ACTIVEX
-       cp $(top_builddir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
-       cp $(top_builddir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
Unnamed repository; edit this file 'description' to name the repository.