Cosmetic.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ffc51501117238fbc47bd3747e88c38d60c5c5d..8d05d54221bc5df467c2e88ccc5471c5f7227ca1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,11 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
+BASE_SUBDIRS = po src modules share doc test
 EXTRA_SUBDIRS = m4 extras/package/ipkg \
        bindings/python \
        libs/loader libs/srtp \
        projects/mozilla projects/activex
-DIST_SUBDIRS = $(SUBDIRS) $(EXTRA_SUBDIRS)
+DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po src
 if LOADER
@@ -291,7 +292,7 @@ dist-hook:
 # Building libvlc
 ###############################################################################
 
-bin_SCRIPTS = vlc-config
+noinst_SCRIPTS = vlc-config
 vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
        $(SHELL) ./config.status --file=$@
        chmod 0755 $@
@@ -308,7 +309,7 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 # 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) libvlc.la
+       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
 
 core:
        cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
@@ -350,7 +351,7 @@ endif
 ###############################################################################
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
-bin_SCRIPTS += $(ALIASES)
+bin_SCRIPTS = $(ALIASES)
 CLEANFILES += $(ALIASES)
 if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
@@ -379,17 +380,15 @@ nvlc: make-alias
        $(MKALIAS) ncurses
 
 if BUILD_VLC
-noinst_SCRIPTS = vlc$(EXEEXT)
+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
+vlc$(EXEEXT): Makefile.am
+       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
@@ -559,7 +558,6 @@ VLC-release.app: vlc
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
 VLC.app: vlc 
-       ( cd src && make install )
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
@@ -634,7 +632,7 @@ VLC.app: 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
-       find modules/ -name '*_plugin.$(LIBEXT)' | while read i; do \
+       find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
          if test -n "$$i" ; \
           then ln -sfn "`pwd`/$$i" \
                                   "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
@@ -673,8 +671,8 @@ package-win-common:
 # Copy relevant files
        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/libvlccore$(LIBEXT)" "vlc-$(VERSION)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
-       cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
 
        for file in AUTHORS MAINTAINERS THANKS ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
@@ -776,8 +774,8 @@ endif
 
 package-win-common-strip:
        $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)"
+       $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
        $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
-       $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)"
 if BUILD_MOZILLA
        $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
 endif