From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 5 Sep 2024 14:24:08 +0000 (+0200)
Subject: libcurl.def: move from / into lib
X-Git-Tag: curl-8_10_0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d1504b205b88cfb917b84734693bf9553abae6f;p=thirdparty%2Fcurl.git

libcurl.def: move from / into lib

It is meant for the library, it belongs in lib/

Closes #14796
---

diff --git a/.github/labeler.yml b/.github/labeler.yml
index e6a64e873d..3284d2ad83 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -80,7 +80,7 @@ build:
               plan9/**,\
               projects/**,\
               winbuild/**,\
-              libcurl.def\
+              lib/libcurl.def\
               }"
 
 CI:
@@ -539,5 +539,5 @@ Windows:
               projects/**,\
               src/tool_doswin.c,\
               winbuild/**,\
-              libcurl.def\
+              lib/libcurl.def\
               }"
diff --git a/Makefile.am b/Makefile.am
index e6ebb99a57..ecbaf4d266 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ PLAN9_DIST = plan9/include/mkfile \
 
 EXTRA_DIST = CHANGES.md COPYING maketgz Makefile.dist curl-config.in    \
  RELEASE-NOTES libcurl.pc.in $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)  \
- $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat libcurl.def Dockerfile
+ $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat Dockerfile
 
 CLEANFILES = $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) \
  $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)       \
diff --git a/REUSE.toml b/REUSE.toml
index 93c50dd71f..7823a853bd 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -24,7 +24,7 @@ path = [
   "docs/TODO",
   "GIT-INFO.md",
   "lib/libcurl.vers.in",
-  "libcurl.def",
+  "lib/libcurl.def",
   "packages/OS400/README.OS400",
   "packages/vms/build_vms.com",
   "packages/vms/curl_release_note_start.txt",
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4b1bcbbe77..98b4616a17 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -164,7 +164,7 @@ if(BUILD_SHARED_LIBS)
   if(WIN32)
     set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "libcurl.rc")
     if(CURL_HIDES_PRIVATE_SYMBOLS)
-      set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "${CURL_SOURCE_DIR}/libcurl.def")
+      set_property(TARGET ${LIB_SHARED} APPEND PROPERTY SOURCES "${CURL_SOURCE_DIR}/lib/libcurl.def")
     endif()
   endif()
   target_link_libraries(${LIB_SHARED} PRIVATE ${CURL_LIBS})
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cf9c67917d..90a0343523 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,7 +28,8 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 EXTRA_DIST = Makefile.mk config-win32.h config-win32ce.h config-plan9.h \
  config-riscos.h config-mac.h curl_config.h.in config-dos.h libcurl.rc  \
  config-amigaos.h config-win32ce.h config-os400.h setup-os400.h         \
- $(CMAKE_DIST) setup-win32.h .checksrc Makefile.soname optiontable.pl
+ $(CMAKE_DIST) setup-win32.h .checksrc Makefile.soname optiontable.pl   \
+ libcurl.def
 
 lib_LTLIBRARIES = libcurl.la
 
diff --git a/libcurl.def b/lib/libcurl.def
similarity index 100%
rename from libcurl.def
rename to lib/libcurl.def
diff --git a/tests/data/test1279 b/tests/data/test1279
index 041f5449b4..4b9ce2f198 100644
--- a/tests/data/test1279
+++ b/tests/data/test1279
@@ -24,7 +24,7 @@ Verify libcurl.def against CURL_EXTERN declarations
 </client>
 
 <verify>
-<stdout loadfile="%SRCDIR/../libcurl.def">
+<stdout loadfile="%SRCDIR/../lib/libcurl.def">
 </stdout>
 </verify>