X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=61b6def08ce29abc107564d643fd667bda34d9bb;hb=a99dcf71d19a9f4e9ac28992b326bae766484d1c;hp=69f5f06225e2f24025ad4454ca970360f01e0cae;hpb=2799d36bc8abdc28df29a202acdb27223b25a7a7;p=vlc diff --git a/Makefile.am b/Makefile.am index 69f5f06225..61b6def08c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,16 +2,28 @@ # Automake targets and declarations ############################################################################### +NULL = + # 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 +DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools + +EXTRA_DIST = \ + HACKING \ + INSTALL.win32 \ + MAINTAINERS \ + Modules.am \ + README.MacOSX.rtf \ + bootstrap \ + configure.ac.in \ + install-win32 \ + src/extras/COPYING \ + toolbox \ + vlc.spec \ + $(NULL) -EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS \ - INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \ - Modules.am macosx-dmg \ - configure.ac.in mkinstalldirs bootstrap MOSTLYCLEANFILES = BUILT_SOURCES = SUFFIXES = @@ -29,6 +41,10 @@ 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 +# 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 ############################################################################### @@ -89,7 +105,7 @@ if RELEASE CPPFLAGS_release = -DHAVE_RELEASE endif if DEBUG -CPPFLAGS_debug = -DDEBUG -DHAVE_RELEASE +CPPFLAGS_debug = -DDEBUG CFLAGS_debug = -g endif if GPROF @@ -112,6 +128,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ endif endif endif +else +# !OPTIM +CFLAGS_optim = @CFLAGS_NOOPTIM@ endif CPPFLAGS_default += $(CPPFLAGS_release) \ @@ -130,7 +149,8 @@ OBJCFLAGS_default += $(CFLAGS_optim) $(CFLAGS_nodebug) \ BUILT_SOURCES += \ include/vlc_symbols.h \ src/misc/modules_builtin.h \ - src/misc/modules_plugin.h + src/misc/modules_plugin.h \ + $(NULL) pkgincludedir = $(includedir)/vlc @@ -141,7 +161,8 @@ dist_pkginclude_HEADERS = \ include/vlc/sout.h \ include/vlc/decoder.h \ include/vlc/input.h \ - include/vlc/intf.h + include/vlc/intf.h \ + $(NULL) noinst_HEADERS += $(HEADERS_include) $(HEADERS_include_built) @@ -151,12 +172,16 @@ HEADERS_include = \ include/beos_specific.h \ include/configuration.h \ include/darwin_specific.h \ + include/codecs.h \ + include/error.h \ + include/encoder.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/main.h \ include/mmx.h \ include/modules.h \ @@ -167,6 +192,7 @@ HEADERS_include = \ include/os_specific.h \ include/stream_control.h \ include/stream_output.h \ + include/variables.h \ include/video.h \ include/video_output.h \ include/vlc_common.h \ @@ -177,58 +203,36 @@ HEADERS_include = \ include/vlc_playlist.h \ include/vlc_threads.h \ include/vlc_threads_funcs.h \ - include/win32_specific.h + include/win32_specific.h \ + include/osd.h \ + $(NULL) HEADERS_include_built = \ - include/vlc_symbols.h + include/vlc_symbols.h \ + $(NULL) include/vlc_symbols.h: Makefile $(HEADERS_include) - rm -f $@.in - echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> $@.in - echo 'struct module_symbols_t {' >> $@.in - cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> $@.in - echo '};' >> $@.in - echo '#ifdef __PLUGIN__' >> $@.in - cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> $@.in - echo '#endif /* __PLUGIN__ */' >> $@.in - mv -f $@.in $@ + ./toolbox --update-includes $(BUILTINS) src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include) - rm -f $@.tmp && cp $@.in $@.tmp - sed -e 's#.*\$[I][d]:.*# * Automatically generated from '$@'.in by bootstrap#' < $@.in > $@.tmp - echo '#define STORE_SYMBOLS( p_symbols ) \' >> $@.tmp - cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $@.tmp - echo '' >> $@.tmp - mv -f $@.tmp $@ + ./toolbox --update-includes $(BUILTINS) src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in - rm -f $@.tmp && cp $@.in $@.tmp -if HAVE_BUILTINS - for i in $(BUILTINS) ; do echo "int vlc_entry__"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@.tmp; done - echo "" >> $@.tmp -endif - echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@.tmp - echo " do \\" >> $@.tmp - echo " { \\" >> $@.tmp -if HAVE_BUILTINS - for i in $(BUILTINS) ; do echo " ALLOCATE_BUILTIN("`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@.tmp ; done -endif - echo " } while( 0 );" >> $@.tmp - echo "" >> $@.tmp - mv -f $@.tmp $@ + ./toolbox --update-includes $(BUILTINS) + +# These dependencies are mandatory +$(SOURCES): include/vlc_symbols.h +$(SOURCES_libvlc): src/misc/modules_plugin.h src/misc/modules_builtin.h $(LIB_intl) ############################################################################### -# Optional getopt +# Optional libintl - FIXME, bad dependencies ############################################################################### -EXTRA_DIST += \ - extras/GNUgetopt/COPYING \ - extras/GNUgetopt/getopt.c \ - extras/GNUgetopt/getopt.h \ - extras/GNUgetopt/getopt1.c +intl/libintl.a: FORCE + cd intl && $(MAKE) -if BUILD_GETOPT -SOURCES_libgetopt = extras/GNUgetopt/getopt.c extras/GNUgetopt/getopt1.c +if BUILD_INTL +LIB_intl = intl/libintl.a endif ############################################################################### @@ -240,6 +244,7 @@ EXTRA_DIST += \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \ extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \ extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ + extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \ extras/MacOSX/Resources/divx.icns \ extras/MacOSX/Resources/generic.icns \ extras/MacOSX/Resources/mpeg.icns \ @@ -247,12 +252,52 @@ EXTRA_DIST += \ extras/MacOSX/Resources/mpeg2.icns \ extras/MacOSX/Resources/mpeg4.icns \ extras/MacOSX/Resources/vlc.icns \ + extras/MacOSX/Resources/back.png \ + extras/MacOSX/Resources/begin.png \ + extras/MacOSX/Resources/end.png \ + extras/MacOSX/Resources/forw.png \ + extras/MacOSX/Resources/list.png \ extras/MacOSX/Resources/pause.png \ extras/MacOSX/Resources/play.png \ + extras/MacOSX/Resources/prefs.png \ + extras/MacOSX/Resources/slow.png \ extras/MacOSX/Resources/stop.png \ - extras/MacOSX/Resources/stepf.png \ - extras/MacOSX/Resources/stepr.png \ - extras/MacOSX/vlc.pbproj/project.pbxproj + extras/MacOSX/Resources/vlc_hg.png \ + extras/MacOSX/Resources/about_bg.png \ + extras/MacOSX/Resources/vlc.scriptSuite \ + extras/MacOSX/Resources/README \ + extras/MacOSX/vlc.pbproj/project.pbxproj \ + extras/MacOSX/macosx-dmg \ + $(NULL) + +############################################################################### +# MS Visual Studio and eMbedded Visual Studio projects +############################################################################### + +EXTRA_DIST += \ + msvc/vlc.dsw \ + msvc/libvlc.dsp.in \ + msvc/plugins.dsp.in \ + msvc/vlc.dsp.in \ + msvc/config.h.in \ + 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.in \ + 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) ############################################################################### # Building libvlc @@ -265,33 +310,64 @@ lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic) lib_libvlc_a_SOURCES = $(SOURCES_libvlc) 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_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) if HAVE_BEOS -SOURCES_libvlc_beos = src/misc/beos_specific.cpp +OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) endif if HAVE_DARWIN -SOURCES_libvlc_darwin = src/misc/darwin_specific.c +OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) endif if HAVE_WIN32 -SOURCES_libvlc_win32 = src/misc/win32_specific.c +OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) +endif +if BUILD_DIRENT +OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) +endif +if BUILD_GETOPT +OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) endif if BUILD_MOZILLA LIBRARIES_libvlc_pic = lib/libvlc_pic.a endif EXTRA_DIST += \ + $(SOURCES_libvlc_beos) \ + $(SOURCES_libvlc_darwin) \ + $(SOURCES_libvlc_win32) \ + $(SOURCES_libvlc_dirent) \ + $(SOURCES_libvlc_getopt) \ + $(NULL) + +SOURCES_libvlc_beos = \ src/misc/beos_specific.cpp \ - src/misc/darwin_specific.c \ - src/misc/win32_specific.c + $(NULL) -BUILT_SOURCES += \ - src/misc/modules_builtin.h +SOURCES_libvlc_darwin = \ + src/misc/darwin_specific.m \ + $(NULL) -SOURCES_libvlc = \ +SOURCES_libvlc_win32 = \ + src/misc/win32_specific.c \ + $(NULL) + +SOURCES_libvlc_dirent = \ + src/extras/dirent.c \ + src/extras/dirent.h \ + $(NULL) + +SOURCES_libvlc_getopt = \ + src/extras/getopt.c \ + src/extras/getopt.h \ + src/extras/getopt1.c \ + $(NULL) + +SOURCES_libvlc_common = \ src/libvlc.c \ src/libvlc.h \ src/interface/interface.c \ @@ -321,19 +397,27 @@ SOURCES_libvlc = \ src/stream_output/stream_output.c \ src/misc/mtime.c \ src/misc/modules.c \ - src/misc/modules_plugin.h \ src/misc/threads.c \ src/misc/cpu.c \ src/misc/configuration.c \ src/misc/netutils.c \ src/misc/iso_lang.c \ - src/misc/iso-639.def \ + src/misc/iso-639_def.h \ src/misc/messages.c \ src/misc/objects.c \ - src/misc/extras.c \ - $(SOURCES_libvlc_win32) \ - $(SOURCES_libvlc_beos) \ - $(SOURCES_libvlc_darwin) + src/misc/variables.c \ + src/misc/error.c \ + src/extras/libc.c \ + $(NULL) + +SOURCES_libvlc = \ + $(SOURCES_libvlc_common) \ + $(OPT_SOURCES_libvlc_beos) \ + $(OPT_SOURCES_libvlc_darwin) \ + $(OPT_SOURCES_libvlc_win32) \ + $(OPT_SOURCES_libvlc_dirent) \ + $(OPT_SOURCES_libvlc_getopt) \ + $(NULL) ############################################################################### # Building vlc @@ -341,16 +425,20 @@ SOURCES_libvlc = \ bin_PROGRAMS += vlc -vlc_SOURCES = src/vlc.c $(SOURCES_libgetopt) +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) $(noinst_share_vlc_win32_rc_DATA) @AUTOMAKE_SUCKS@ -vlc_DEPENDENCIES = lib/libvlc.a $(L_builtin) +vlc_LDADD = lib/libvlc.a $(LDFLAGS_vlc) \ + $(DATA_win32_rc) $(LIB_intl) @AUTOMAKE_SUCKS@ vlc_CFLAGS = $(CPPFLAGS_default) $(CFLAGS_default) -vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) +# 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) + +vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) @rm -f vlc$(EXEEXT) $(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS) if HAVE_BEOS @@ -367,33 +455,153 @@ install-exec-local: if HAVE_DARWIN # Create the MacOS X app -vlc_app_DATA = vlc.app +vlc_app_DATA = VLC.app vlc_appdir = $(bindir) -vlc.app: vlc - rm -Rf vlc.app - cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$" - cp -r extras/MacOSX/build/vlc.bundle ./vlc.app - $(INSTALL) -d vlc.app/Contents/MacOS/share - $(INSTALL) -d vlc.app/Contents/MacOS/modules - $(INSTALL) vlc vlc.app/Contents/MacOS/ -# FIXME: install modules ! (and add dependency on modules) - $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share +VLC.app: vlc $(PLUGIN_FILES) + 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 + 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 ; \ + done + echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo endif if HAVE_WIN32 +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 +############################################################################### +# Building architecture-specific binary packages +############################################################################### + +# XXX: this rule is probably only useful to you if you have exactly +# the same setup as me. Contact sam@zoy.org if you need to use it. +# +# 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; \ + else \ + echo "OK."; mkdir tmp; \ + fi +# Create installation script + cp install-win32 tmp/nsi +# Copy relevant files + cp vlc.exe tmp/ + $(STRIP) tmp/vlc.exe + cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt + for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \ + do cp $$file tmp/$${file}.txt ; \ + unix2dos 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 + + for i in dummy tmp/plugins/*$(LIBEXT) ; \ + do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \ + -a $$i != dummy ; then $(STRIP) $$i ; fi ; done + + mkdir tmp/share + cp share/*.rle tmp/share/ ; + + mkdir 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 ; \ + done + + mkdir -p tmp/skins/default + for i in share/skins/default/*.*; do \ + cp $$i tmp/skins/default/ || true ; \ + done + for i in doc/skins/*.txt; do \ + cp $$i 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 +# Clean up + rm -Rf 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; \ + else \ + echo "OK."; mkdir tmp; \ + fi + +# Create dir + mkdir -p tmp/vlc/share +# Copy relevant files + cp vlc tmp/vlc/ + $(STRIP) tmp/vlc/vlc + xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc + cp AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ + for file in default8x16.psf default8x9.psf ; \ + do cp share/$$file tmp/vlc/share/ ; done + mkdir tmp/vlc/plugins + for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ + $(INSTALL) $$i tmp/vlc/plugins/ ; \ + fi ; done + for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done +# Create package + mv tmp/vlc tmp/vlc-${VERSION} + (cd tmp ; find vlc-${VERSION} | \ + zip -9 -@ vlc-${VERSION}-BeOS-x86.zip ) + mv tmp/vlc-${VERSION}-BeOS-x86.zip . +# Clean up + rm -Rf 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; \ + else \ + echo "OK."; mkdir tmp; \ + fi + +# Copy relevant files + cp -R VLC.app tmp/ + cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ + +# Create disk image + ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/* + +# Clean up + rm -Rf tmp + ############################################################################### # Building the Mozilla plugin ############################################################################### noinst_LIBRARIES += $(noinst_LIBRARIES_mozilla) -MOSTLYCLEANFILES += mozilla/libvlcplugin$(LIBEXT) +MOSTLYCLEANFILES += $(LIBRARIES_mozilla) EXTRA_DIST += $(SOURCES_mozilla) mozilla/vlcintf.idl @@ -405,28 +613,54 @@ SOURCES_mozilla = \ mozilla/vlcplugin.h \ mozilla/vlcpeer.cpp \ mozilla/vlcpeer.h \ - mozilla/classinfo.h \ - mozilla/npunix.c + mozilla/support/classinfo.h \ + $(SOURCES_mozilla_win32) \ + $(SOURCES_mozilla_macosx) \ + $(SOURCES_mozilla_unix) \ + $(NULL) + +# Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix +# the common naming scheme is lib******plugin.so. Also, we need npwin.cpp +# under Win32 and npunix.c under Unix. +if HAVE_WIN32 +LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT) +SOURCES_mozilla_win32 = mozilla/support/npwin.cpp +CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32 +else +if HAVE_DARWIN +# We don't define LIBRARIES_mozilla because we'll be using project builder +SOURCES_mozilla_macosx = mozilla/support/npmac.cpp +else +LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT) +SOURCES_mozilla_unix = mozilla/support/npunix.c +endif +endif if BUILD_MOZILLA -noinst_LIBRARIES_mozilla = mozilla/libvlcplugin.a +if UNTRUE +noinst_LIBRARIES_mozilla = mozilla/libplugin.a +endif -mozilla_libvlcplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla) \ - $(SOURCES_libgetopt) -mozilla_libvlcplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CFLAGS_mozilla) -mozilla_libvlcplugin_a_CXXFLAGS = $(CPPFLAGS_pic) $(CXXFLAGS_pic) \ - $(CPPFLAGS_mozilla) $(CXXFLAGS_mozilla) -mozilla_libvlcplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(L_builtin_pic) +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) BUILT_SOURCES_mozilla = mozilla/vlcintf.h +$(SOURCES_mozilla): mozilla/vlcintf.h -mozilla_libvlcplugin_DATA = mozilla/libvlcplugin$(LIBEXT) -mozilla_libvlcplugindir = $(libdir)/mozilla/plugins -mozilla/libvlcplugin$(LIBEXT): mozilla/libvlcplugin.a $(L_builtin_pic) - $(CC) -o $@ $(mozilla_libvlcplugin_a_OBJECTS) lib/libvlc_pic.a \ - $(L_builtin_pic) -shared $(LDFLAGS) $(LDFLAGS_vlc) \ - $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic) +mozilla_plugin_DATA = $(LIBRARIES_mozilla) +mozilla_plugindir = $(libdir)/mozilla/plugins +$(LIBRARIES_mozilla): $(mozilla_libplugin_a_OBJECTS) \ + $(mozilla_libplugin_a_DEPENDENCIES) \ + $(L_builtin_pic) + $(CXXLINK) $(mozilla_libplugin_a_OBJECTS) $(DATA_npvlc_rc) \ + lib/libvlc_pic.a $(L_builtin_pic) -shared $(LDFLAGS) \ + $(LDFLAGS_vlc) $(LDFLAGS_mozilla) $(LDFLAGS_builtin_pic) mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt mozilla_vlcintf_xptdir = $(libdir)/mozilla/components @@ -437,12 +671,27 @@ mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl $(XPIDL) -I/usr/share/idl/mozilla -m header \ -o mozilla/vlcintf 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 $@ +endif endif ############################################################################### # Modules ############################################################################### +MOSTLYCLEANFILES += $(PLUGIN_FILES) +PLUGIN_FILES = + libvlcdir = $(libdir)/vlc include Modules.am +############################################################################### +# Force rule +############################################################################### +FORCE: