]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use lldiv replacement on FreeBSD < 5.0 (fixes #840)
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 368c1a0a326808001d58c0f368c429c5ddc7d1e3..dd6347a817253c357639857fafad342c2e4ddc62 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,8 +26,9 @@ EXTRA_DIST = \
        toolbox \
        vlc-api.pl \
        vlc-config.in.in \
-       vlc.spec \
-       vlc.spec.mdk \
+       vlc.fedora.spec \
+       vlc.mandriva.spec \
+       vlc.altlinux.spec \
        vlc.win32.nsi.in \
        $(NULL)
 
@@ -39,10 +40,7 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 SUFFIXES = 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
-       --disable-ffmpeg --disable-faad --disable-skins2
-if USE_LIBTOOL
-DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
-endif
+       --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
 
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
@@ -155,6 +153,41 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
+       extras/MacOSX/Resources/add_embedded.png \
+       extras/MacOSX/Resources/add_embedded_blue.png \
+       extras/MacOSX/Resources/repeat_embedded.png \
+       extras/MacOSX/Resources/repeat_embedded_blue.png \
+       extras/MacOSX/Resources/repeat_single_embedded_blue.png \
+       extras/MacOSX/Resources/shuffle_embedded.png \
+       extras/MacOSX/Resources/shuffle_embedded_blue.png \
+       extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
+       extras/MacOSX/Resources/fs_volume_slider_knob.png \
+       extras/MacOSX/Resources/fs_volume_slider_bar.png \
+       extras/MacOSX/Resources/fs_volume_mute_highlight.png \
+       extras/MacOSX/Resources/fs_volume_mute.png \
+       extras/MacOSX/Resources/fs_volume_max_highlight.png \
+       extras/MacOSX/Resources/fs_volume_max.png \
+       extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
+       extras/MacOSX/Resources/fs_time_slider_knob.png \
+       extras/MacOSX/Resources/fs_time_slider.png \
+       extras/MacOSX/Resources/fs_stop_highlight.png \
+       extras/MacOSX/Resources/fs_stop.png \
+       extras/MacOSX/Resources/fs_skip_previous_highlight.png \
+       extras/MacOSX/Resources/fs_skip_previous.png \
+       extras/MacOSX/Resources/fs_skip_next_highlight.png \
+       extras/MacOSX/Resources/fs_skip_next.png \
+       extras/MacOSX/Resources/fs_rewind_highlight.png \
+       extras/MacOSX/Resources/fs_rewind.png \
+       extras/MacOSX/Resources/fs_play_highlight.png \
+       extras/MacOSX/Resources/fs_play.png \
+       extras/MacOSX/Resources/fs_pause_highlight.png \
+       extras/MacOSX/Resources/fs_pause.png \
+       extras/MacOSX/Resources/fs_forward_highlight.png \
+       extras/MacOSX/Resources/fs_forward.png \
+       extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
+       extras/MacOSX/Resources/fs_exit_fullscreen.png \
+       extras/MacOSX/Resources/fs_background.png \
+       extras/MacOSX/fullscreen_panel.svg \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
        extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
@@ -247,9 +280,9 @@ vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -version-info 0:0:0
 LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
+vlc_LDFLAGS =
 else
 if BUILD_SHARED
 vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
@@ -271,14 +304,14 @@ endif
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
-core:
-       rm -f src/$(LIB_libvlc)
-       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+libvlc:
+       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-.PHONY: core
+core: libvlc vlc$(EXEEXT)
 
-src/$(LIB_libvlc):
-       cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+.PHONY: libvlc core
+
+src/$(LIB_libvlc): libvlc
 
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
        @rm -f vlc$(EXEEXT)
@@ -394,21 +427,23 @@ VLC-release.app: vlc
            interaction.m \
            embeddedwindow.h \
            embeddedwindow.m \
+           fspanel.h \
+           fspanel.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       case $(target_triplet) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+       case $(host_os) 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 ../../../; \
+         *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 ../../../; \
+         *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
@@ -534,21 +569,23 @@ VLC.app: vlc
            interaction.m \
            embeddedwindow.h \
            embeddedwindow.m \
+           fspanel.h \
+           fspanel.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       case $(target_triplet) in \
-         *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
-           cd ../../../; \
+       case $(host_os) 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 ../../../; \
+         *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 ../../../; \
+         *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
@@ -767,7 +804,7 @@ package-win32-base-exe-linux:
 
 package-win32-base-zip: package-win32-base
 # Create package 
-       zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+       zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION}
 
 package-win32-base-7zip: package-win32-base
 # Create package 
@@ -822,7 +859,7 @@ package-beos:
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
        mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-       (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+       (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
        mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
@@ -833,7 +870,7 @@ package-beos:
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
        mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
-       (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+       (cd $(srcdir)/tmp &&  zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
        mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
 
 # Clean up
@@ -849,7 +886,11 @@ package-macosx:
        mkdir -p "$(top_builddir)/vlc-${VERSION}/";
 
 # Copy relevant files 
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+       @if test -e "$(top_builddir)/VLC-release.app/"; then \
+         cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+       else \
+         cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+       fi
        cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
 
 # Create disk image 
@@ -925,7 +966,7 @@ package-translations:
 update-po:
        rm -f $(top_srcdir)/po/POTFILES.in
        { \
-         cd $(top_srcdir) ; \
+         cd $(top_srcdir) && \
          echo "# automatically created by make update-po" ; \
          echo "" ; \
          echo "# main sources" ; \
@@ -934,7 +975,7 @@ update-po:
            | sort ; \
          echo "" ; \
          echo "# modules" ; \
-         find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name 'qt4/ui/*.ui'\
+         find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
            | grep -v '\(\.moc\.\|gui/gtk2/\)' \
            | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
            | sort ; \
Unnamed repository; edit this file 'description' to name the repository.