Qt: fix sizing of the interface

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 9daa4c8285aa69fb17eb85c3032ef69a1c41dd19..b8d8b41cf7dc36775f5cff72ec633445d92a1e26 100644 (file)
--- 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
@@ -190,8 +188,7 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlccore` \
        -DLOCALEDIR=\"$(localedir)\" \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(vlcdatadir)\" \
-       -DLIBDIR=\"$(libdir)\" \
-       -DPLUGIN_PATH=\"$(vlclibdir)\"
+       -DPKGLIBDIR=\"$(vlclibdir)\"
 libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlccore` $(AM_LDFLAGS) \
        -no-undefined \
        -export-symbols $(srcdir)/libvlccore.sym \
@@ -229,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) \
@@ -258,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
@@ -303,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 \
@@ -345,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 \
@@ -439,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 \
@@ -482,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 = \