X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=15e5515c0473e4ae39ad5bcb207a4cbba2909b85;hb=151825fb08ff7238dae21fb9b813be1ca4ccd2f0;hp=116e0d25e490a381703ed4427203a63f5e70b9db;hpb=b01e357d015d7fb8957f96568b371574d6790054;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 116e0d25e4..15e5515c04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_events.h \
 	../include/vlc_filter.h \
 	../include/vlc_fourcc.h \
+	../include/vlc_fs.h \
 	../include/vlc_gcrypt.h \
 	../include/vlc_http.h \
 	../include/vlc_httpd.h \
@@ -170,9 +171,6 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
 # Building libvlc
 ###############################################################################
 
-nice:
-	$(top_builddir)/compile
-
 lib_LTLIBRARIES = libvlccore.la libvlc.la
 
 AM_LDFLAGS = -no-undefined
@@ -191,7 +189,8 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
 	-DLIBDIR=\"$(libdir)\" \
-	-DPLUGIN_PATH=\"$(vlclibdir)\"
+	-DPKGLIBDIR=\"$(vlclibdir)\" \
+	-DPLUGIN_PATH=PKGLIBDIR\"/modules\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
@@ -379,6 +378,7 @@ SOURCES_libvlc_common = \
 	video_output/vout_pictures.c \
 	video_output/vout_pictures.h \
 	video_output/video_text.c \
+	video_output/video_epg.c \
 	video_output/video_widgets.c \
 	video_output/vout_subpictures.c \
 	video_output/window.c \