X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=b8d8b41cf7dc36775f5cff72ec633445d92a1e26;hb=cc28873a137884794da5c09c5ccfd7b21a07e2e7;hp=8468da07b2693fb4acb23f06e4393f29bcf3930e;hpb=c7eabcd9174667cfd57430f0220407bb5d806f98;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index 8468da07b2..b8d8b41cf7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,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,8 +188,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATA_PATH=\"$(vlcdatadir)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DPLUGIN_PATH=\"$(vlclibdir)/modules\"
+	-DPKGLIBDIR=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
 	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
@@ -230,7 +226,6 @@ EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_win32) \
 	$(SOURCES_libvlc_other) \
 	$(SOURCES_libvlc_dirent) \
-	$(SOURCES_libvlc_getopt) \
 	$(SOURCES_libvlc_httpd) \
 	$(SOURCES_libvlc_sout) \
 	$(SOURCES_libvlc_vlm) \
@@ -259,9 +254,6 @@ endif
 if BUILD_DIRENT
 libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
-if BUILD_GETOPT
-libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
-endif
 if BUILD_HTTPD
 libvlccore_la_SOURCES += $(SOURCES_libvlc_httpd)
 endif
@@ -304,12 +296,6 @@ SOURCES_libvlc_dirent = \
 	extras/dirent.c \
 	$(NULL)
 
-SOURCES_libvlc_getopt = \
-	extras/getopt.c \
-	extras/getopt.h \
-	extras/getopt1.c \
-	$(NULL)
-
 SOURCES_libvlc_common = \
 	libvlc.c \
 	libvlc.h \
@@ -346,6 +332,7 @@ SOURCES_libvlc_common = \
 	input/es_out_timeshift.c \
 	input/event.c \
 	input/input.c \
+	input/info.h \
 	input/meta.c \
 	input/access.h \
 	input/clock.h \
@@ -440,6 +427,8 @@ SOURCES_libvlc_common = \
 	config/keys.c \
 	config/cmdline.c \
 	config/dirs.c \
+	config/getopt.c \
+	config/vlc_getopt.h \
 	misc/events.c \
 	misc/image.c \
 	misc/messages.c \
@@ -483,7 +472,6 @@ SOURCES_libvlc = \
 	$(OPT_SOURCES_libvlc_darwin) \
 	$(OPT_SOURCES_libvlc_win32) \
 	$(OPT_SOURCES_libvlc_dirent) \
-	$(OPT_SOURCES_libvlc_getopt) \
 	$(NULL)
 
 SOURCES_libvlc_control = \