X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e2815c4e2236d27b89bb7b1fa2a0bd361dbc645c;hb=54bfce03bbcc85369e5f775206921b91ce3db91b;hp=0138389738edfed3509d93d43208f055209bfd0b;hpb=b00db8ce608789faa8e37b48ead95f99a34ae13a;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 0138389738..e2815c4e22 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,16 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po compat src bin modules share doc test
-EXTRA_SUBDIRS = m4 \
-	libs/srtp
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-SUBDIRS = po compat src
+DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
+SUBDIRS = compat doc po share src modules lib
 if BUILD_VLC
 SUBDIRS += bin
 endif
-SUBDIRS += modules share doc test
+SUBDIRS += test
 
 EXTRA_DIST = \
 	HACKING \
@@ -349,8 +345,11 @@ MAINTAINERCLEANFILES = ChangeLog
 libcompat:
 	cd compat && $(MAKE) $(AM_MAKEFLAGS)
 
-libvlc: libcompat
-	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+libvlccore: libcompat
+	cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+
+libvlc: libvlccore
+	cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core: libvlc vlc$(EXEEXT)
 	cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)