X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=870250f3f57ccdf12d57f60ef246a7fd0f917521;hb=f56d550753a30c5bae8e44fef87b8986cc309ac2;hp=9f0c54eb2d3ccd97a8d30c550878efa489352edf;hpb=d97e6fb4a2d4260a38d14936942ff241b873617c;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 9f0c54eb2d..870250f3f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,9 +45,9 @@ AUTOMAKE_OPTIONS = \
 	1.9 \
 	-Wall \
 	check-news \
-	std-options \
 	dist-bzip2 \
 	no-dist-gzip
+#	std-options
 
 ###############################################################################
 # MacOS X project
@@ -211,7 +211,7 @@ EXTRA_DIST += \
 # Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
-	extras/analyser/Makefile \
+	extras/analyser/zsh_completion.sh \
 	extras/analyser/zsh.cpp \
 	extras/analyser/emacs.init \
 	extras/analyser/vlc.vim \
@@ -245,51 +245,17 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-	cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
-.PHONY: libvlc
+core:
+	cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
 
-###############################################################################
-# Building vlc
-###############################################################################
-
-bin_PROGRAMS = vlc
-
-vlc_SOURCES = src/vlc.c
-# Ugly kludge so that automake defines $(CXXLINK)
-nodist_EXTRA_vlc_SOURCES = extras/analyser/zsh.cpp src/misc/darwin_specific.c
-
-vlc_DEPENDENCIES = $(DATA_win32_rc)
-
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
-vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-if !HAVE_PLUGINS
-vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
-endif
-
-vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-LIB_libvlc = libvlc.la
-LIBVLC = src/$(LIB_libvlc)
+.PHONY: libvlc core
 
 #To get some nice output
 nice:
 	$(top_builddir)/compile
 
-core: libvlc vlc$(EXEEXT)
-
-.PHONY: core
-
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
-	@rm -f vlc$(EXEEXT)
-	@case `$(VLC_CONFIG) --linkage vlc builtin` in \
-	  c++) cmd="$(CXXLINK)" ;; \
-	  objc) cmd="$(OBJCLINK)" ;; \
-	  c|*) cmd="$(LINK)" ;; \
-	esac ; \
-	cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
-	echo $$cmd ; \
-	eval $$cmd
-
 if HAVE_BEOS
 noinst_DATA = vlc-bundle
 vlc-bundle: vlc
@@ -322,7 +288,10 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
+CLEANFILES += $(ALIASES)
+if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
 
 dist_noinst_SCRIPTS += make-alias
 
@@ -346,9 +315,24 @@ qvlc: make-alias
 nvlc: make-alias
 	$(MKALIAS) ncurses
 
+if BUILD_VLC
+noinst_SCRIPTS = vlc$(EXEEXT)
+endif
+
+vlc$(EXEEXT): core
+	rm -f vlc$(EXEEXT)
+	ln -s src/vlc$(EXEEXT)
+#	rm -f -- vlc vlc.tmp
+#	echo '#! /bin/sh' > vlc.tmp
+#	echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+#	chmod +x vlc.tmp
+#	mv -f -- vlc.tmp vlc
+
 if HAVE_DARWIN
 # Create the MacOS X app
+if BUILD_VLC
 noinst_DATA = VLC.app
+endif
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
 	( cd src && make install )
@@ -391,6 +375,8 @@ VLC-release.app: vlc
 	    prefs_widgets.m \
 	    prefs.h \
 	    prefs.m \
+	    simple_prefs.h \
+	    simple_prefs.m \
 	    vout.h \
 	    voutqt.m \
 	    voutgl.m \
@@ -420,7 +406,7 @@ VLC-release.app: vlc
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/package/macosx/Framework/Pre-Compile.sh
+	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
 	for i in $(srcdir)/share/luaplaylist/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
@@ -559,6 +545,8 @@ VLC.app: vlc
 	    prefs_widgets.m \
 	    prefs.h \
 	    prefs.m \
+	    simple_prefs.h \
+	    simple_prefs.m \
 	    vout.h \
 	    voutqt.m \
 	    voutgl.m \
@@ -588,7 +576,7 @@ VLC.app: vlc
 	          $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-	$(INSTALL) $(top_builddir)/.libs/vlc \
+	$(INSTALL) $(top_builddir)/src/.libs/vlc \
 		   $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
@@ -611,15 +599,6 @@ VLC.app: vlc
 	printf "APPLVLC#" >| $(top_builddir)/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) -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 architecture-specific binary packages
 ###############################################################################
@@ -638,7 +617,7 @@ package-win-common:
 	fi
 
 # Copy relevant files
-	cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
@@ -646,8 +625,8 @@ package-win-common:
 	for file in AUTHORS MAINTAINERS THANKS ; \
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
-	   do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-	  unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+	  do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+	unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
 	mkdir $(top_builddir)/vlc-$(VERSION)/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \