diff options
| author | fuzzard <fuzzard@kodi.tv> | 2022-03-01 07:23:42 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2022-03-07 19:46:40 +1000 |
| commit | 17d5408c1994976c85be0aeacedd8293c0949ff5 (patch) | |
| tree | ae0804c32d2edb2121c761c002483d617f43a180 | |
| parent | 64dd94b518f82c0ab602dc90828e049c4e483403 (diff) | |
[tools/depends] rename libfstrcmp to fstrcmp
rename libfstrcmp to just fstrcmp. This brings some consistency to naming in other parts
of kodi cmake (eg target fstrcmp)
| -rw-r--r-- | cmake/modules/FindFstrcmp.cmake | 2 | ||||
| -rw-r--r-- | tools/depends/target/Makefile | 2 | ||||
| -rw-r--r-- | tools/depends/target/fstrcmp/FSTRCMP-VERSION (renamed from tools/depends/target/libfstrcmp/LIBFSTRCMP-VERSION) | 0 | ||||
| -rw-r--r-- | tools/depends/target/fstrcmp/Makefile (renamed from tools/depends/target/libfstrcmp/Makefile) | 6 |
4 files changed, 4 insertions, 6 deletions
diff --git a/cmake/modules/FindFstrcmp.cmake b/cmake/modules/FindFstrcmp.cmake index 55646669e0..93e81416e6 100644 --- a/cmake/modules/FindFstrcmp.cmake +++ b/cmake/modules/FindFstrcmp.cmake @@ -15,7 +15,7 @@ if(ENABLE_INTERNAL_FSTRCMP) include(ExternalProject) include(cmake/scripts/common/ModuleHelpers.cmake) - set(MODULE_LC libfstrcmp) + set(MODULE_LC fstrcmp) SETUP_BUILD_VARS() diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index 9741994c8a..5852772c7f 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -18,6 +18,7 @@ DEPENDS = \ freetype2 \ freetype2-noharfbuzz \ fribidi \ + fstrcmp \ gettext \ gmp \ gnutls \ @@ -30,7 +31,6 @@ DEPENDS = \ libdvdnav \ libdvdread \ libffi \ - libfstrcmp \ libgcrypt \ libgpg-error \ libjpeg-turbo \ diff --git a/tools/depends/target/libfstrcmp/LIBFSTRCMP-VERSION b/tools/depends/target/fstrcmp/FSTRCMP-VERSION index 87b85918ae..87b85918ae 100644 --- a/tools/depends/target/libfstrcmp/LIBFSTRCMP-VERSION +++ b/tools/depends/target/fstrcmp/FSTRCMP-VERSION diff --git a/tools/depends/target/libfstrcmp/Makefile b/tools/depends/target/fstrcmp/Makefile index a453ea77e1..a39bb851d1 100644 --- a/tools/depends/target/libfstrcmp/Makefile +++ b/tools/depends/target/fstrcmp/Makefile @@ -1,6 +1,5 @@ -include ../../Makefile.include LIBFSTRCMP-VERSION -DEPS = ../../Makefile.include Makefile LIBFSTRCMP-VERSION ../../download-files.include -include ../../download-files.include +include ../../Makefile.include FSTRCMP-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile FSTRCMP-VERSION ../../download-files.include # configuration settings CONFIGURE=./configure --prefix=$(PREFIX) @@ -9,7 +8,6 @@ LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) |