Cleanup a few more library builds

cmake-proxies/libflac/CMakeLists.txt

@@ -1,8 +1,5 @@
 
-# FIXME:  Once switch to cmake is made, remove Windows pragmas
-#         from AudacityApp.cpp and change target name to "flac/flac++"
 add_library( ${TARGET} STATIC )
-add_library( ${TARGET}++ STATIC )
 
 def_vars()
 
@@ -41,9 +38,7 @@ list( APPEND SOURCES
       ${TARGET_ROOT}/src/libFLAC/ogg_helper.c
       ${TARGET_ROOT}/src/libFLAC/ogg_mapping.c
       $<$<BOOL:${WIN32}>:${TARGET_ROOT}/src/share/win_utf8_io/win_utf8_io.c>
-)
 
-list( APPEND SOURCES++ 
       # libflac++
       ${TARGET_ROOT}/src/libFLAC++/metadata.cpp
       ${TARGET_ROOT}/src/libFLAC++/stream_decoder.cpp
@@ -68,12 +63,6 @@ list( APPEND DEFINES
 list( APPEND LIBRARIES
    PUBLIC
       libogg
-      libflac++
-)
-
-list( APPEND LIBRARIES++
-   PRIVATE
-      libflac
 )
 
 set( CPU_IS_BIG_ENDIAN ${WORDS_BIGENDIAN} )
@@ -91,9 +80,3 @@ target_compile_definitions( ${TARGET} PRIVATE ${DEFINES} )
 target_include_directories( ${TARGET} PRIVATE ${INCLUDES} )
 target_link_libraries( ${TARGET} PRIVATE ${LIBRARIES} )
 
-organize_source( "${TARGET_ROOT}" "" "${SOURCES++}" )
-target_sources( ${TARGET}++ PRIVATE ${SOURCES++} )
-target_compile_definitions( ${TARGET}++ PRIVATE ${DEFINES} )
-target_include_directories( ${TARGET}++ PRIVATE ${INCLUDES} )
-target_link_libraries( ${TARGET}++ PRIVATE ${LIBRARIES++} )
-

cmake-proxies/libvamp/CMakeLists.txt

@@ -1,6 +1,5 @@
 
 add_library( ${TARGET} STATIC )
-add_library( ${TARGET}-hostsdk ALIAS ${TARGET} )
 
 def_vars()
 

cmake-proxies/libvorbis/CMakeLists.txt

@@ -1,7 +1,5 @@
 
 add_library( ${TARGET} STATIC )
-add_library( ${TARGET}enc ALIAS ${TARGET} )
-add_library( ${TARGET}file ALIAS ${TARGET} )
 
 def_vars()
 

src/CMakeLists.txt

@@ -1068,24 +1068,12 @@ list( APPEND LIBRARIES
       libsndfile
       libsoxr
       portaudio-v19
-#      $<$<BOOL:${USE_FFMPEG}>:ibavcodec>
-#      $<$<BOOL:${USE_FFMPEG}>:libavformat>
-#      $<$<BOOL:${USE_FFMPEG}>:libavutil>
       $<$<BOOL:${USE_FFMPEG}>:ffmpeg>
       $<$<BOOL:${USE_LIBID3TAG}>:libid3tag>
-
-      # This flac mess can be resolved by removing the Windows pragmas
-      # in AudacityApp.cpp.
-      $<$<BOOL:${USE_LIBFLAC}>:flac>
-      $<$<BOOL:${USE_LIBFLAC}>:flac++>
       $<$<BOOL:${USE_LIBFLAC}>:libflac>
-
       $<$<BOOL:${USE_LIBMAD}>:libmad>
       $<$<BOOL:${USE_LIBOGG}>:libogg>
       $<$<BOOL:${USE_LIBVORBIS}>:libvorbis>
-#      $<$<BOOL:${USE_LIBVORBIS}>:libvorbis>
-#      $<$<BOOL:${USE_LIBVORBIS}>:libvorbisenc>
-#      $<$<BOOL:${USE_LIBVORBIS}>:libvorbisfile>
       $<$<BOOL:${USE_LIBTWOLAME}>:twolame>
       $<$<BOOL:${USE_LV2}>:lv2>
       $<$<BOOL:${USE_MIDI}>:portmidi>
@@ -1095,7 +1083,6 @@ list( APPEND LIBRARIES
       $<$<BOOL:${USE_SBSMS}>:sbsms>
       $<$<BOOL:${USE_SOUNDTOUCH}>:soundtouch>
       $<$<BOOL:${USE_VAMP}>:libvamp>
-#      $<$<BOOL:${USE_VAMP}>:libvamp-hostsdk>
       $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD>:PkgConfig::GLIB>
       $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD>:PkgConfig::GTK>
       $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD,NetBSD>:z>