mirror of
https://github.com/moparisthebest/curl
synced 2024-12-24 00:58:48 -05:00
tests/libtest: Add lib1521 to nodist_SOURCES
Since 467da3af0
, lib1521.c is generated instead of checked in. According
to the commit message, the intention was to remove it from the tarball
as well. However, it is still present when running make dist. To remove
it, add it to nodist_lib1521_SOURCES. This also means there is no need
for the manually added dist-rule in the Makefile.
Also update CMakelists.txt to handle the fact that we now may have
nodist_SOURCES.
This commit is contained in:
parent
f8045799b4
commit
76457ccdec
@ -27,7 +27,11 @@ transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.
|
||||
include(${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake)
|
||||
|
||||
foreach(TEST_NAME ${noinst_PROGRAMS})
|
||||
setup_test(${TEST_NAME} ${${TEST_NAME}_SOURCES})
|
||||
if(DEFINED ${TEST_NAME}_SOURCES)
|
||||
setup_test(${TEST_NAME} ${${TEST_NAME}_SOURCES})
|
||||
else()
|
||||
setup_test(${TEST_NAME} ${nodist_${TEST_NAME}_SOURCES})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# Allows for hostname override to make tests machine independent.
|
||||
|
@ -131,6 +131,3 @@ lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/
|
||||
|
||||
checksrc:
|
||||
@PERL@ $(top_srcdir)/lib/checksrc.pl $(srcdir)/*.c
|
||||
|
||||
dist:
|
||||
rm lib1521.c
|
||||
|
@ -405,7 +405,7 @@ lib1517_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1517
|
||||
lib1520_SOURCES = lib1520.c $(SUPPORTFILES)
|
||||
lib1520_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1520
|
||||
|
||||
lib1521_SOURCES = lib1521.c $(SUPPORTFILES)
|
||||
nodist_lib1521_SOURCES = lib1521.c $(SUPPORTFILES)
|
||||
lib1521_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)
|
||||
|
||||
lib1525_SOURCES = lib1525.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
||||
|
Loading…
Reference in New Issue
Block a user