Commit dc2c11a1 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

- Remove unneeded "." kludge (libvlc is now built from src)

- Remove old NULL kludge
parent 7255b4fc
...@@ -2,18 +2,13 @@ ...@@ -2,18 +2,13 @@
# Automake targets and declarations # Automake targets and declarations
############################################################################### ###############################################################################
NULL =
# SUBDIRS stores the directories where a "make" is required when building # SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but # something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information. # which have makefiles with distribution information.
# - intl should come before modules and . because all the code uses gettext # - intl (gettext) is needed by src and modules
# - modules should come before . because vlc needs the builtins # - src (libvlc) is nedeed by modules, mozilla and bindings
# - . should come before mozilla/bindings because the plugin needs libvlc.a # - libs/* are needed by modules
# - po should come before . because VLC.app needs the pofiles SUBDIRS = intl po libs/loader libs/srtp src modules \
# - loader should come before modules because some plugins need it
SUBDIRS = intl po libs/loader libs/srtp \
src modules . \
mozilla bindings activex share doc mozilla bindings activex share doc
DIST_SUBDIRS = $(SUBDIRS) m4 ipkg DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
...@@ -31,8 +26,7 @@ EXTRA_DIST = \ ...@@ -31,8 +26,7 @@ EXTRA_DIST = \
vlc.fedora.spec \ vlc.fedora.spec \
vlc.mandriva.spec \ vlc.mandriva.spec \
vlc.altlinux.spec \ vlc.altlinux.spec \
vlc.win32.nsi.in \ vlc.win32.nsi.in
$(NULL)
BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
BUILT_SOURCES_clean = macosx-sdk BUILT_SOURCES_clean = macosx-sdk
...@@ -203,8 +197,7 @@ EXTRA_DIST += \ ...@@ -203,8 +197,7 @@ EXTRA_DIST += \
extras/MacOSX/plugin/InstallerInfo.plist \ extras/MacOSX/plugin/InstallerInfo.plist \
extras/MacOSX/plugin/InstallerDescription.plist \ extras/MacOSX/plugin/InstallerDescription.plist \
extras/MacOSX/plugin/pbdevelopment.plist \ extras/MacOSX/plugin/pbdevelopment.plist \
extras/MacOSX/plugin/English.lproj/InfoPlist.strings \ extras/MacOSX/plugin/English.lproj/InfoPlist.strings
$(NULL)
############################################################################### ###############################################################################
# Various utilities ( editor syntax files, D-Bus controller ... ) # Various utilities ( editor syntax files, D-Bus controller ... )
...@@ -218,8 +211,7 @@ EXTRA_DIST += \ ...@@ -218,8 +211,7 @@ EXTRA_DIST += \
extras/valgrind.suppressions \ extras/valgrind.suppressions \
extras/m4/autoconf260.m4 \ extras/m4/autoconf260.m4 \
extras/dbus-vlc.py \ extras/dbus-vlc.py \
extras/dbus-vlc.glade \ extras/dbus-vlc.glade
$(NULL)
############################################################################### ###############################################################################
# MS Visual Studio and eMbedded Visual Studio projects # MS Visual Studio and eMbedded Visual Studio projects
...@@ -238,8 +230,7 @@ EXTRA_DIST += \ ...@@ -238,8 +230,7 @@ EXTRA_DIST += \
evc/plugins.vcp.in \ evc/plugins.vcp.in \
evc/errno.h \ evc/errno.h \
evc/config.h.in \ evc/config.h.in \
evc/modules_builtin_evc.h \ evc/modules_builtin_evc.h
$(NULL)
dist-hook: dist-hook:
cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment