summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/metadata/Makefile.am12
-rw-r--r--src/metadata/mp4/Makefile.am18
-rwxr-xr-xsrc/plugins/rohling/Makefile.am6
3 files changed, 2 insertions, 34 deletions
diff --git a/src/metadata/Makefile.am b/src/metadata/Makefile.am
index 8e7209f..494ee23 100644
--- a/src/metadata/Makefile.am
+++ b/src/metadata/Makefile.am
@@ -1,12 +1,4 @@
-if with_mp4v2
-MP4_SUBDIR = mp4
-MP4_LDADD = mp4/libtagmp4.la
-else
-MP4_SUBDIR = m4a
-MP4_LDADD = m4a/libtagm4a.la
-endif
-
-SUBDIRS = speex wavpack trueaudio asf audible rmff $(MP4_SUBDIR) aac wav ape optimfrog
+SUBDIRS = speex wavpack trueaudio asf audible rmff m4a aac wav ape optimfrog
INCLUDES = $(all_includes) $(taglib_includes)
@@ -29,7 +21,7 @@ libmetadata_la_LIBADD = \
asf/libtagasf.la \
wav/libtagwav.la \
rmff/libtagrealmedia.la \
- $(MP4_LDADD) \
+ m4a/libtagm4a.la \
$(taglib_libs) \
aac/libtagaac.la \
audible/libtagaudible.la \
diff --git a/src/metadata/mp4/Makefile.am b/src/metadata/mp4/Makefile.am
deleted file mode 100644
index e0779c6..0000000
--- a/src/metadata/mp4/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-SUBDIRS =
-
-INCLUDES = $(all_includes) $(MP4V2_INCLUDES) $(taglib_includes)
-METASOURCES = AUTO
-libtagmp4_la_LDFLAGS = $(all_libraries) $(MP4V2_LIBS)
-noinst_LTLIBRARIES = libtagmp4.la
-
-libtagmp4_la_SOURCES = \
- mp4properties.cpp \
- mp4tag.cpp \
- mp4file.cpp \
- taglib_mp4filetyperesolver.cpp
-
-noinst_HEADERS = \
- mp4properties.h \
- mp4tag.h \
- mp4file.h \
- taglib_mp4filetyperesolver.h
diff --git a/src/plugins/rohling/Makefile.am b/src/plugins/rohling/Makefile.am
deleted file mode 100755
index a346d10..0000000
--- a/src/plugins/rohling/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pluginsdir = $(kde_datadir)/soundkonverter/plugins
-format_infos_endir = $(kde_datadir)/soundkonverter/format_infos/en
-plugins_DATA = 127.faac-280.soundkonverter.xml
-format_infos_en_DATA = faac_3gp.280.xml \
- faac_aac.280.xml \
- faac_m4a.280.xml