Fix and restore nice file names

Shame on me

diff --git a/src/Makefile.am b/src/Makefile.am
index 620be93f81963c89b8d5dbe6a37c38e3f85c7cfe..932aef0753145e7758c5069946da0ac87b521873 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,8 @@
 # Automake targets and declarations
 ###############################################################################
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 NULL =
 SUBDIRS =
 
@@ -291,7 +293,7 @@ SOURCES_libvlc_common = \
        audio_output/common.c \
        audio_output/dec.c \
        audio_output/filters.c \
-       audio_output/ainput.c \
+       audio_output/input.c \
        audio_output/mixer.c \
        audio_output/output.c \
        audio_output/intf.c \
@@ -334,12 +336,12 @@ SOURCES_libvlc_common = \
        misc/hashtables.c \
        misc/version.c \
        extras/libc.c \
-       control/libvlc_core.c \
-       control/libvlc_playlist.c \
-       control/libvlc_vlm.c \
-       control/libvlc_input.c \
-       control/libvlc_video.c \
-       control/libvlc_audio.c \
+       control/core.c \
+       control/playlist.c \
+       control/vlm.c \
+       control/input.c \
+       control/video.c \
+       control/audio.c \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \

diff --git a/src/audio_output/ainput.c b/src/audio_output/input.c
similarity index 100%
rename from src/audio_output/ainput.c
rename to src/audio_output/input.c

diff --git a/src/control/libvlc_audio.c b/src/control/audio.c
similarity index 100%
rename from src/control/libvlc_audio.c
rename to src/control/audio.c

diff --git a/src/control/libvlc_core.c b/src/control/core.c
similarity index 100%
rename from src/control/libvlc_core.c
rename to src/control/core.c

diff --git a/src/control/libvlc_input.c b/src/control/input.c
similarity index 100%
rename from src/control/libvlc_input.c
rename to src/control/input.c

diff --git a/src/control/libvlc_playlist.c b/src/control/playlist.c
similarity index 100%
rename from src/control/libvlc_playlist.c
rename to src/control/playlist.c

diff --git a/src/control/libvlc_video.c b/src/control/video.c
similarity index 100%
rename from src/control/libvlc_video.c
rename to src/control/video.c

diff --git a/src/control/libvlc_vlm.c b/src/control/vlm.c
similarity index 100%
rename from src/control/libvlc_vlm.c
rename to src/control/vlm.c