# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
-SUBDIRS = po intl m4 share
-DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
+SUBDIRS = intl modules . share po m4
+DIST_SUBDIRS = $(SUBDIRS) src debian doc ipkg lib autotools
EXTRA_DIST = \
HACKING \
Modules.am \
README.MacOSX.rtf \
bootstrap \
- configure.ac.in \
install-win32 \
src/extras/COPYING \
toolbox \
+ vlc-config.in.in \
vlc.ebuild \
vlc.spec \
vlc.spec.redhat \
$(NULL)
-MOSTLYCLEANFILES =
BUILT_SOURCES =
SUFFIXES =
-# List of programs, libraries and headers that need to be built and/or
-# distributed. Initialized to empty because we'll use += later.
-bin_PROGRAMS =
-
-lib_LIBRARIES =
-libvlc_LIBRARIES =
-noinst_LIBRARIES =
-
-noinst_HEADERS =
-
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
-# XXX: these flags could be set in configure.ac.in, but we set them here
+# XXX: these flags could be set in configure.ac, but we set them here
# because old versions of automake don't support them in configure.ac.
AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
-###############################################################################
-# Compilation flags for debug mode, profiling, and others
-###############################################################################
-
-# Standard flags used everywhere to build things in the distribution. Some
-# of them are empty but might be extended later in the Makefile. *_default
-# is the default flag list for all files in the distribution, for instance
-# the vlc code. *_pic is for PIC code, such as the Mozilla plugin. *_plugin
-# is for plugin code, *_builtin is for builtin code, and *_builtin_pic is
-# for PIC builtin code, for instance builtin modules in the mozilla plugin.
-
-CPPFLAGS_default = -I$(top_srcdir)/include
-CFLAGS_default =
-CXXFLAGS_default =
-OBJCFLAGS_default =
-LDFLAGS_default = $(LDFLAGS_gprof)
-
-CPPFLAGS_pic = $(CPPFLAGS_default)
-CFLAGS_pic = $(CFLAGS_default) @CFLAGS_pics@
-CXXFLAGS_pic = $(CXXFLAGS_default) @CFLAGS_pics@
-OBJCFLAGS_pic = $(OBJCFLAGS_default) @CFLAGS_pics@
-LDFLAGS_pic = $(LDFLAGS_default)
-
-CPPFLAGS_plugin = $(CPPFLAGS_default) -D__VLC__ -D__PLUGIN__
-CFLAGS_plugin = $(CFLAGS_default) @CFLAGS_plugins@
-CXXFLAGS_plugin = $(CXXFLAGS_default) @CFLAGS_plugins@
-OBJCFLAGS_plugin = $(OBJCFLAGS_default) @CFLAGS_plugins@
-LDFLAGS_plugin = @LDFLAGS_plugins@
-
-CPPFLAGS_builtin = $(CPPFLAGS_default) -D__VLC__ -D__BUILTIN__
-CFLAGS_builtin = $(CFLAGS_default) @CFLAGS_builtins@
-CXXFLAGS_builtin = $(CXXFLAGS_default) @CFLAGS_builtins@
-OBJCFLAGS_builtin = $(OBJCFLAGS_default) @CFLAGS_builtins@
-LDFLAGS_builtin =
-L_builtin =
-
-CPPFLAGS_builtin_pic = $(CPPFLAGS_builtin) $(CPPFLAGS_pic)
-CFLAGS_builtin_pic = $(CFLAGS_builtin) $(CFLAGS_pic)
-CXXFLAGS_builtin_pic = $(CXXFLAGS_builtin) $(CXXFLAGS_pic)
-OBJCFLAGS_builtin_pic = $(OBJCFLAGS_builtin) $(OBJCFLAGS_pic)
-LDFLAGS_builtin_pic = $(LDFLAGS_builtin) $(LDFLAGS_pic)
-L_builtin_pic = $(L_builtin) $(L_pic)
-
-# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
-CPPFLAGS_default += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
-CPPFLAGS_default += -D_REENTRANT -D_THREAD_SAFE
-CPPFLAGS_default += -D_GNU_SOURCE
-
-# Gettext support
-CPPFLAGS_default += -DLOCALEDIR=\"$(datadir)/locale\"
-
-# Data and plugin location
-CPPFLAGS_default += -DDATA_PATH=\"@prefix@/share/vlc\"
-CPPFLAGS_default += -DPLUGIN_PATH=\"@prefix@/lib/vlc\"
-
-# Conditional flags that get added to *FLAGS_default
-if RELEASE
-CPPFLAGS_release = -DHAVE_RELEASE
-endif
-if DEBUG
-CPPFLAGS_debug = -DDEBUG
-CFLAGS_debug = -g
-endif
-if GPROF
-CPPFLAGS_gprof = -DGPROF
-CFLAGS_gprof = -pg
-LDFLAGS_gprof = -pg
-endif
-if CPROF
-CPPFLAGS_cprof = -DCPROF
-CFLAGS_cprof = -finstrument-functions
-endif
-if OPTIM
-CFLAGS_optim = @CFLAGS_OPTIM@ @CFLAGS_TUNING@
-if DEBUG
-else
-if GPROF
-else
-if CPROF
-else
-CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@
-endif
-endif
-endif
-else
-# !OPTIM
-CFLAGS_optim = @CFLAGS_NOOPTIM@
-endif
-
-CPPFLAGS_default += $(CPPFLAGS_release) \
- $(CPPFLAGS_debug) $(CPPFLAGS_gprof) $(CPPFLAGS_cprof)
-CFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \
- $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof)
-CXXFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \
- $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof)
-OBJCFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \
- $(CFLAGS_debug) $(CFLAGS_gprof) $(CFLAGS_cprof)
-
###############################################################################
# Headers
###############################################################################
include/vlc/intf.h \
$(NULL)
-noinst_HEADERS += $(HEADERS_include) $(HEADERS_include_built)
+noinst_HEADERS = $(HEADERS_include) $(HEADERS_include_built)
HEADERS_include = \
include/aout_internal.h \
include/input_ext-dec.h \
include/input_ext-intf.h \
include/input_ext-plugins.h \
- include/interface.h \
include/intf_eject.h \
include/iso_lang.h \
include/httpd.h \
include/os_specific.h \
include/stream_control.h \
include/stream_output.h \
+ include/announce.h \
include/variables.h \
- include/video.h \
include/video_output.h \
include/vlc_common.h \
include/vlc_config.h \
include/vlc_cpu.h \
+ include/vlc_interface.h \
include/vlc_messages.h \
include/vlc_objects.h \
include/vlc_playlist.h \
include/vlc_threads.h \
include/vlc_threads_funcs.h \
+ include/vlc_video.h \
include/vout_synchro.h \
include/win32_specific.h \
include/osd.h \
$(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
- ./toolbox --update-includes $(BUILTINS)
+ $(srcdir)/toolbox --update-includes
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
- ./toolbox --update-includes $(BUILTINS)
+ $(srcdir)/toolbox --update-includes
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
- ./toolbox --update-includes $(BUILTINS)
+ $(srcdir)/toolbox --update-includes
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
###############################################################################
intl/libintl.a: FORCE
- cd intl && $(MAKE)
+ cd $(top_builddir)/intl && $(MAKE) $(AM_MAKEFLAGS)
if BUILD_INTL
LIB_intl = intl/libintl.a
evc/modules_builtin_evc.h \
$(NULL)
-show-libvlc-sources: FORCE
- @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt)
-
-show-libvlc-headers: FORCE
- @echo X: $(HEADERS_include) $(HEADERS_include_built)
-
-show-libvlc-pkg-headers: FORCE
- @echo X: $(dist_pkginclude_HEADERS)
-
dist-hook:
- mv vlc.ebuild vlc-${VERSION}.ebuild
- cd $(distdir); ./toolbox --update-vc
+ mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
+ cd $(distdir) && $(srcdir)/toolbox --update-vc
###############################################################################
# Building libvlc
bin_SCRIPTS = vlc-config
-lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic)
+lib_LIBRARIES = lib/libvlc.a $(LIBRARIES_libvlc_pic)
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h
-lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@
-lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default)
-lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default)
+lib_libvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
+lib_libvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc`
+lib_libvlc_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc`
lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
-lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@
-lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic)
-lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic)
+lib_libvlc_pic_a_CFLAGS = `$(VLC_CONFIG) --cflags vlc pic`
+lib_libvlc_pic_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags vlc pic`
+lib_libvlc_pic_a_OBJCFLAGS = `$(VLC_CONFIG) --objcflags vlc pic`
if HAVE_BEOS
OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
src/audio_output/output.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
+ src/stream_output/announce.c \
src/misc/mtime.c \
src/misc/modules.c \
src/misc/threads.c \
# Building vlc
###############################################################################
-bin_PROGRAMS += vlc
+bin_PROGRAMS = vlc
vlc_SOURCES = src/vlc.c
-# @AUTOMAKE_SUCKS@ gets expanded to $(L_builtin) $(LDFLAGS_builtin)
-# but we don't write it directly, otherwise automake will go amok and eat all
-# the memory because of its 2^N crap algorithm. So we fool him. Nuahaha.
-vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \
- $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@
-vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default)
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc builtin`
+vlc_LDADD = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
+vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
# We use DEPENDENCIES_vlc instead of vlc_DEPENDENCIES because of an
# old automake-1.5 bug (automake/279).
-DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl)
+DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
- @rm -f vlc$(EXEEXT)
- $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
+ @rm -f $(srcdir)/vlc$(EXEEXT)
+ case `$(VLC_CONFIG) --linkage vlc builtin` in \
+ c++) $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ objc) $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ c|*) $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+ esac
if HAVE_BEOS
- xres -o $@ ./share/vlc_beos.rsrc
+ xres -o $@ $(srcdir)/share/vlc_beos.rsrc
mimeset -f $@
- rm -Rf locale ; mkdir locale
+ rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale"
for i in $(ALL_LINGUAS); do \
- mkdir -p locale/$${i}/LC_MESSAGES ; \
- cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \
+ cp "$(srcdir)/po/$${i}.gmo" \
+ "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
done
endif
-# Install the symlinks
+# Install the modules and the symlinks
install-exec-local:
- for i in dummy $(ALIASES) ; do if test "x$$i" != "xdummy" ; then \
- rm -f $(DESTDIR)$(bindir)/$$i && \
- ln -s vlc $(DESTDIR)$(bindir)/$$i ; \
+ for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
+ $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
+ fi ; done
+ for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+ $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
+ fi ; done
+ for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
+ rm -f "$(DESTDIR)$(bindir)/$$i" && \
+ ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
if HAVE_DARWIN
# Create the MacOS X app
vlc_app_DATA = VLC.app
vlc_appdir = $(bindir)
-VLC.app: vlc $(PLUGIN_FILES)
+VLC.app: vlc
rm -Rf VLC.app
- cd extras/MacOSX ; pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
- cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
- $(INSTALL) -d VLC.app/Contents/MacOS
- $(INSTALL) vlc VLC.app/Contents/MacOS/VLC
- $(INSTALL) -d VLC.app/Contents/MacOS/modules
- for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
- $(INSTALL) $$i VLC.app/Contents/MacOS/modules/ ; \
- fi ; done
- $(INSTALL) -d VLC.app/Contents/MacOS/share
- $(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share
- $(INSTALL) -d VLC.app/Contents/MacOS/locale
+ cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+ cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
+ $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
+ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+ if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
+ "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
+ fi ; done
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
+ $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
+ $(srcdir)/VLC.app/Contents/MacOS/share
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \
- mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
- cp po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
- mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \
- ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \
+ mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done
- echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
+ printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
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) --include-dir share -i $< -o $@
+ $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@
endif
###############################################################################
#
# Check that tmp isn't in the way
package-win32:
- @if test -e tmp; then \
- echo "Error: please remove ./tmp, it is in the way"; false; \
+ @if test -e "$(srcdir)/tmp"; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
else \
- echo "OK."; mkdir tmp; \
+ echo "OK."; mkdir -p "$(srcdir)/tmp"; \
fi
# Create installation script
- cp install-win32 tmp/nsi
+ cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
# Copy relevant files
- cp vlc$(EXEEXT) tmp/
- $(STRIP) tmp/vlc$(EXEEXT)
- cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
+ cp "$(srcdir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
+ $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
+ cp "$(srcdir)/INSTALL.win32" "$(srcdir)/tmp/INSTALL.txt"
+ unix2dos "$(srcdir)/tmp/INSTALL.txt"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
- do cp $$file tmp/$${file}.txt ; \
- unix2dos tmp/$${file}.txt ; done
+ do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
+ unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
- mkdir tmp/plugins
- for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
- $(INSTALL) $$i tmp/plugins/ ; \
- fi ; done
+ mkdir -p "$(srcdir)/tmp/plugins"
+ for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+ if test -n "$$i" ; then \
+ $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
+ fi ; done
- for i in dummy tmp/plugins/*$(LIBEXT) ; \
- do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \
- -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+ for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
+ do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
- mkdir tmp/share
- cp share/*.rle tmp/share/ ;
+ mkdir -p "$(srcdir)/tmp/share"
+ cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
- mkdir tmp/locale
+ mkdir $(srcdir)/tmp/locale
for i in $(ALL_LINGUAS); do \
- mkdir -p tmp/locale/$${i}/LC_MESSAGES ; \
- cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
+ cp "$(srcdir)/po/$${i}.gmo" \
+ "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
done
- mkdir -p tmp/skins/default
- for i in share/skins/default/*.*; do \
- cp $$i tmp/skins/default/ || true ; \
+ mkdir -p $(srcdir)/tmp/skins/default
+ for i in $(srcdir)/share/skins/default/*.*; do \
+ cp $$i $(srcdir)/tmp/skins/default/ || true ; \
done
- for i in doc/skins/*.txt; do \
- cp $$i tmp/skins/ || true ; \
+ for i in $(srcdir)/doc/skins/*.txt; do \
+ cp $$i $(srcdir)/tmp/skins/ || true ; \
done
- cd doc/faq ; $(MAKE) html ; cd ../.. ;
- cp doc/faq/index.html tmp/FAQ.htm ;
-
# Create package
- wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
# Clean up
- rm -Rf tmp
+ rm -Rf $(srcdir)/tmp
package-beos:
# Check that tmp isn't in the way
- @if test -e tmp; then \
- echo "Error: please remove ./tmp, it is in the way"; false; \
+ @if test -e $(srcdir)/tmp; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
else \
- echo "OK."; mkdir tmp; \
+ echo "OK."; mkdir $(srcdir)/tmp; \
fi
# Copy relevant files
- mkdir -p tmp/vlc
- cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+ mkdir -p $(srcdir)/tmp/vlc
+ cd $(srcdir) && \
+ cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
- if [ `find modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
- mkdir -p tmp/vlc/plugins; \
- find modules -name "lib*_plugin.so" | xargs -i{} cp {} tmp/vlc/plugins/; \
+ if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
+ mkdir -p $(srcdir)/tmp/vlc/plugins; \
+ find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
fi
for i in $(ALL_LINGUAS); do \
- mkdir -p tmp/vlc/locale/$${i}/LC_MESSAGES ; \
- cp po/$${i}.gmo tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done
- mkdir -p tmp/vlc/share
- cp share/*.rle tmp/vlc/share/
+ mkdir -p $(srcdir)/tmp/vlc/share
+ cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
# Create package with debug symbols
- mimeset -f tmp/vlc/* tmp/vlc/*/*
- mv tmp/vlc tmp/vlc-${VERSION}
- (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
- mv tmp/vlc-${VERSION}-BeOS.zip .
+ mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
+ (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
# Create package without debug symbols
- strip tmp/vlc-${VERSION}/vlc
- if [ -d tmp/vlc-${VERSION}/plugins ]; then \
- strip tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+ strip $(srcdir)/tmp/vlc-${VERSION}/vlc
+ if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
+ strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
fi
- xres -o tmp/vlc-${VERSION}/vlc share/vlc_beos.rsrc
- mimeset -f tmp/vlc-${VERSION}/* tmp/vlc-${VERSION}/*/*
- (cd tmp ; zip -9 -r vlc-${VERSION}-BeOS-stripped.zip vlc-${VERSION} )
- mv tmp/vlc-${VERSION}-BeOS-stripped.zip .
+ xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
+ mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
+ (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
# Clean up
- rm -Rf tmp
+ rm -Rf $(srcdir)/tmp
package-macosx:
# Check that tmp isn't in the way
- @if test -e tmp; then \
- echo "Error: please remove ./tmp, it is in the way"; false; \
+ @if test -e "$(srcdir)/tmp"; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
else \
- echo "OK."; mkdir tmp; \
+ echo "OK."; mkdir -p "$(srcdir)/tmp"; \
fi
# Copy relevant files
- cp -R VLC.app tmp/
- cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
+ cp -R "$(srcdir)/VLC.app" "$(srcdir)/tmp/"
+ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
# Create disk image
- ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/*
+ $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*
# Clean up
- rm -Rf tmp
+ rm -Rf $(srcdir)/tmp
###############################################################################
# Building the Mozilla plugin
###############################################################################
-noinst_LIBRARIES += $(noinst_LIBRARIES_mozilla)
+noinst_LIBRARIES = $(noinst_LIBRARIES_mozilla)
-MOSTLYCLEANFILES += $(LIBRARIES_mozilla)
+MOSTLYCLEANFILES = $(LIBRARIES_mozilla)
EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl
endif
mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
-mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
- $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
- $(CPPFLAGS_mozilla_EXTRA)
-mozilla_libplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \
- $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) \
- $(CPPFLAGS_mozilla_EXTRA)
-mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) $(DATA_npvlc_rc)
+mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
+ $(CPPFLAGS_mozilla_EXTRA) -Imozilla
+mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
+ $(CPPFLAGS_mozilla_EXTRA) -Imozilla
+mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic
BUILT_SOURCES_mozilla = mozilla/vlcintf.h
$(SOURCES_mozilla): mozilla/vlcintf.h
mozilla_plugin_DATA = $(LIBRARIES_mozilla)
mozilla_plugindir = $(libdir)/mozilla/plugins
$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \
- $(mozilla_libplugin_a_DEPENDENCIES) \
- $(L_builtin_pic)
+ $(mozilla_libplugin_a_DEPENDENCIES)
$(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \
- lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \
- $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic)
+ lib/libvlc_pic.a -shared \
+ `$(VLC_CONFIG) --libs vlc mozilla builtin pic`
mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m typelib \
- -o mozilla/vlcintf mozilla/vlcintf.idl
+ -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m header \
- -o mozilla/vlcintf mozilla/vlcintf.idl
+ -o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
if HAVE_WIN32
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) --include-dir mozilla -i $< -o $@
+ $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
endif
endif
###############################################################################
# Modules
###############################################################################
-MOSTLYCLEANFILES += $(PLUGIN_FILES)
-PLUGIN_FILES =
-
-libvlcdir = $(libdir)/vlc
-
include Modules.am
###############################################################################
projects / vlc / blobdiff