From dd0b38b32f7f5f82861be905ac7fdbd9b1bc25f4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 14 Apr 2009 22:00:37 +0000 Subject: first take at bundling cmake-related files in the tarball --- Makefile.am | 12 +++++++++--- lib/Makefile.am | 2 +- src/Makefile.am | 7 ++++--- tests/Makefile.am | 5 +++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am index 442d6c839..457419828 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,15 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat \ - libcurl.pc.in vc6curl.dsw MacOSX-Framework +CMAKE_DIST = CMakeLists.txt CMake/CheckTypeSize.c.in CMake/CheckTypeSize.cmake \ +CMake/CMakeConfigurableFile.in CMake/CurlCheckCSourceCompiles.cmake \ +CMake/CurlCheckCSourceRuns.cmake CMake/CurlTests.c CMake/FindOpenSSL.cmake \ +CMake/FindZLIB.cmake CMake/OtherTests.cmake CMake/Platforms/config-aix.h \ +CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake + +EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ + curl-style.el sample.emacs RELEASE-NOTES buildconf buildconf.bat \ + libcurl.pc.in vc6curl.dsw MacOSX-Framework $(CMAKE_DIST) bin_SCRIPTS = curl-config diff --git a/lib/Makefile.am b/lib/Makefile.am index 4ba294d22..af3f9643d 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -36,7 +36,7 @@ EXTRA_DIST = Makefile.b32 Makefile.m32 Makefile.vc6 Makefile.riscos $(DSP) \ Makefile.netware nwlib.c nwos.c libcurl.imp msvcproj.head msvcproj.foot \ config-win32ce.h config-os400.h setup-os400.h config-symbian.h \ Makefile.Watcom config-tpf.h $(DOCS) $(VCPROJ) mk-ca-bundle.pl \ - firefox-db2pem.sh + firefox-db2pem.sh CMakeLists.txt CLEANFILES = $(DSP) $(VCPROJ) diff --git a/src/Makefile.am b/src/Makefile.am index be768286f..2db575c78 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -55,9 +55,10 @@ NROFF=env LC_ALL=C @NROFF@ @MANOPT@ # figured out by the configure script EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \ Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx \ - macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp curlsrc.dsp \ + macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp curlsrc.dsp \ macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc \ - Makefile.netware Makefile.inc Makefile.Watcom curlsrc.dsw + Makefile.netware Makefile.inc Makefile.Watcom curlsrc.dsw \ + CMakeLists.txt MANPAGE=$(top_srcdir)/docs/curl.1 README=$(top_srcdir)/docs/MANUAL diff --git a/tests/Makefile.am b/tests/Makefile.am index 858e3a74d..96a93ea1f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2009, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -26,7 +26,8 @@ PDFPAGES = testcurl.pdf runtests.pdf EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl getpart.pm \ FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl valgrind.pm ftp.pm \ - sshserver.pl sshhelp.pm testcurl.1 runtests.1 $(HTMLPAGES) $(PDFPAGES) + sshserver.pl sshhelp.pm testcurl.1 runtests.1 $(HTMLPAGES) $(PDFPAGES) \ + CMakeLists.txt SUBDIRS = data server libtest -- cgit v1.2.3