diff options
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | fdk-dabplus.pc.in (renamed from fdk-aac-dabplus.pc.in) | 0 | ||||
| -rw-r--r-- | fdk-dabplus.sym (renamed from fdk-aac.sym) | 0 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 13c9f54..d6eee7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,13 +18,13 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/libFDK/include \ -I$(top_srcdir)/libPCMutils/include -libfdk_aac_la_LINK = $(LINK) $(libfdk_aac_la_LDFLAGS) +libfdk_dabplus_la_LINK = $(LINK) $(libfdk_dabplus_la_LDFLAGS) libtoolame_dab_la_LINK = $(LINK) $(libtoolame_dab_la_LDFLAGS) # Mention a dummy pure C file to trigger generation of the $(LINK) variable -nodist_EXTRA_libfdk_aac_la_SOURCES = dummy.c +nodist_EXTRA_libfdk_dabplus_la_SOURCES = dummy.c -fdk_aacincludedir = $(includedir)/fdk-aac -fdk_aacinclude_HEADERS = \ +fdk_dabplusincludedir = $(includedir)/fdk-dabplus +fdk_dabplusinclude_HEADERS = \ $(top_srcdir)/libSYS/include/machine_type.h \ $(top_srcdir)/libSYS/include/genericStds.h \ $(top_srcdir)/libSYS/include/FDK_audio.h \ @@ -69,20 +69,20 @@ toolame_dabinclude_HEADERS = \ $(top_srcdir)/libtoolame-dab/vlc_input.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = fdk-aac-dabplus.pc +pkgconfig_DATA = fdk-dabplus.pc -lib_LTLIBRARIES = libfdk-aac.la libtoolame-dab.la +lib_LTLIBRARIES = libfdk-dabplus.la libtoolame-dab.la libtoolame_dab_la_CXXFLAGS = -fomit-frame-pointer libtoolame_dab_la_LDFLAGS = -version-info @LIBTOOLAME_DAB_VERSION@ \ -no-undefined \ -export-symbols $(top_srcdir)/libtoolame-dab.sym -libfdk_aac_la_CXXFLAGS = -fno-exceptions -fno-rtti -Wno-narrowing -libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \ - -export-symbols $(top_srcdir)/fdk-aac.sym +libfdk_dabplus_la_CXXFLAGS = -fno-exceptions -fno-rtti -Wno-narrowing +libfdk_dabplus_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \ + -export-symbols $(top_srcdir)/fdk-dabplus.sym -#aac_enc_LDADD = libfdk-aac.la +#aac_enc_LDADD = libfdk-dabplus.la #aac_enc_SOURCES = src/aac-enc.c \ # src/wavreader.c @@ -94,7 +94,7 @@ endif dabplus_enc_LDFLAGS = -no-install -dabplus_enc_LDADD = libfdk-aac.la libtoolame-dab.la \ +dabplus_enc_LDADD = libfdk-dabplus.la libtoolame-dab.la \ -lfec -lzmq -lasound \ -lrt $(dabplus_enc_LDADD_JACK) \ $(LIBVLC_LIBS) @@ -268,7 +268,7 @@ SYS_SRC = \ libSYS/src/genericStds.cpp \ libSYS/src/wav_file.cpp -libfdk_aac_la_SOURCES = \ +libfdk_dabplus_la_SOURCES = \ $(AACDEC_SRC) $(AACENC_SRC) \ $(MPEGTPDEC_SRC) $(MPEGTPENC_SRC) \ $(SBRDEC_SRC) $(SBRENC_SRC) \ @@ -307,7 +307,7 @@ EXTRA_DIST = \ $(top_srcdir)/NOTICE \ $(top_srcdir)/README.md \ $(top_srcdir)/Android.mk \ - $(top_srcdir)/fdk-aac.sym \ + $(top_srcdir)/fdk-dabplus.sym \ $(top_srcdir)/documentation/*.pdf \ $(top_srcdir)/libAACdec/src/*.h \ $(top_srcdir)/libAACdec/src/arm/*.cpp \ diff --git a/configure.ac b/configure.ac index 95b8029..16f570d 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AC_SUBST(LIBS_PRIVATE) AM_CONDITIONAL([IS_GIT_REPO], [test -d '.git']) AC_CONFIG_FILES([Makefile - fdk-aac-dabplus.pc]) + fdk-dabplus.pc]) AC_OUTPUT echo diff --git a/fdk-aac-dabplus.pc.in b/fdk-dabplus.pc.in index 0c45813..0c45813 100644 --- a/fdk-aac-dabplus.pc.in +++ b/fdk-dabplus.pc.in diff --git a/fdk-aac.sym b/fdk-dabplus.sym index 2a06c41..2a06c41 100644 --- a/fdk-aac.sym +++ b/fdk-dabplus.sym |