From: Joel Rosdahl Date: Wed, 7 Feb 2018 11:14:49 +0000 (+0100) Subject: Rearrange files into suitable subdirectories, e.g. src and doc X-Git-Tag: v3.4~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa357782e48;p=thirdparty%2Fccache.git Rearrange files into suitable subdirectories, e.g. src and doc The top directory has become too crowded. --- diff --git a/LICENSE.txt b/LICENSE.txt index 316fb8121..73a452225 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -52,8 +52,8 @@ the GPL: that is, if separated from the ccache sources, they may be usable under less restrictive terms. -getopt_long.[hc] -~~~~~~~~~~~~~~~~ +src/getopt_long.[hc] +~~~~~~~~~~~~~~~~~~~~ This implementation of `getopt_long()` was copied from http://www.postgresql.org[PostgreSQL] and has the following license text: @@ -91,8 +91,8 @@ http://www.postgresql.org[PostgreSQL] and has the following license text: ------------------------------------------------------------------------------- -hashtable*.[hc] -~~~~~~~~~~~~~~~ +src/hashtable*.[hc] +~~~~~~~~~~~~~~~~~~~ This code comes from http://www.cl.cam.ac.uk/~cwc22/hashtable/ with the following license: @@ -413,15 +413,15 @@ This Autoconf M4 snippet comes from http://www.python.org[Python] 2.6's ------------------------------------------------------------------------------- -murmurhashneutral2.[hc] -~~~~~~~~~~~~~~~~~~~~~~~ +src/murmurhashneutral2.[hc] +~~~~~~~~~~~~~~~~~~~~~~~~~~~ This fast hash implementation is released to the public domain by Austin Appleby. See http://murmurhash.googlepages.com. -snprintf.c and m4/snprintf.m4 -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +src/snprintf.c and m4/snprintf.m4 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This implementation of `snprintf()` and similar functions was downloaded from http://www.jhweiss.de/software/snprintf.html and has the following license: @@ -445,8 +445,8 @@ http://www.jhweiss.de/software/snprintf.html and has the following license: ------------------------------------------------------------------------------- -zlib/*.[hc] -~~~~~~~~~~~ +src/zlib/*.[hc] +~~~~~~~~~~~~~~~ This is a bundled subset of zlib 1.2.8 from with the following license: diff --git a/Makefile.in b/Makefile.in index 7b218c35e..e414e875e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,38 +20,38 @@ LIBS = @LIBS@ RANLIB = @RANLIB@ all_cflags = $(CFLAGS) -all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir) $(CPPFLAGS) +all_cppflags = @DEFS@ -DSYSCONFDIR=$(sysconfdir) -I. -I$(srcdir)/src $(CPPFLAGS) extra_libs = @extra_libs@ non_3pp_sources = \ - args.c \ - ccache.c \ - cleanup.c \ - compopt.c \ - conf.c \ - counters.c \ - execute.c \ - exitfn.c \ - hash.c \ - hashutil.c \ - language.c \ - lockfile.c \ - manifest.c \ - mdfour.c \ - stats.c \ - unify.c \ - util.c \ - version.c + src/args.c \ + src/ccache.c \ + src/cleanup.c \ + src/compopt.c \ + src/conf.c \ + src/counters.c \ + src/execute.c \ + src/exitfn.c \ + src/hash.c \ + src/hashutil.c \ + src/language.c \ + src/lockfile.c \ + src/manifest.c \ + src/mdfour.c \ + src/stats.c \ + src/unify.c \ + src/util.c \ + src/version.c 3pp_sources = \ - getopt_long.c \ - hashtable.c \ - hashtable_itr.c \ - murmurhashneutral2.c \ - snprintf.c + src/getopt_long.c \ + src/hashtable.c \ + src/hashtable_itr.c \ + src/murmurhashneutral2.c \ + src/snprintf.c base_sources = $(non_3pp_sources) $(3pp_sources) base_objs = $(base_sources:.c=.o) -ccache_sources = main.c $(base_sources) +ccache_sources = src/main.c $(base_sources) ccache_objs = $(ccache_sources:.c=.o) zlib_sources = \ @@ -98,7 +98,7 @@ zlib/libz.a: $(zlib_objs) .PHONY: perf perf: ccache$(EXEEXT) - $(srcdir)/perf.py --ccache ccache$(EXEEXT) $(CC) $(all_cppflags) $(all_cflags) $(srcdir)/ccache.c + $(srcdir)/perf/perf.py --ccache ccache$(EXEEXT) $(CC) $(all_cppflags) $(all_cflags) $(srcdir)/src/ccache.c .PHONY: test test: ccache$(EXEEXT) unittest/run$(EXEEXT) diff --git a/configure.ac b/configure.ac index f24e1d663..d055b9e41 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ else fi if test x${use_bundled_zlib} = xyes; then - CPPFLAGS="$CPPFLAGS -I\$(srcdir)/zlib" + CPPFLAGS="$CPPFLAGS -I\$(srcdir)/src/zlib" extra_libs="zlib/libz.a" mkdir -p zlib else @@ -166,9 +166,9 @@ else AC_MSG_NOTICE(Developer mode disabled) fi -if test ! -f $srcdir/version.c; then +if test ! -f $srcdir/src/version.c; then AC_MSG_WARN(unable to determine ccache version) - echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >version.c + echo "const char CCACHE_VERSION@<:@@:>@ = \"unknown\";" >src/version.c fi dnl Find test suite files. @@ -185,7 +185,7 @@ cat config.h >>config.h.tmp echo '#endif' >>config.h.tmp mv config.h.tmp config.h -mkdir -p .deps unittest +mkdir -p .deps src unittest AC_MSG_NOTICE(now build ccache by running make) diff --git a/dev.mk.in b/dev.mk.in index 6c348701e..81a411880 100644 --- a/dev.mk.in +++ b/dev.mk.in @@ -5,7 +5,7 @@ all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d ASCIIDOC = asciidoc CPPCHECK = cppcheck -CPPCHECK_SUPPRESSIONS = cppcheck-suppressions.txt +CPPCHECK_SUPPRESSIONS = misc/cppcheck-suppressions.txt SCAN_BUILD = scan-build DOCKER = docker GPERF = gperf @@ -27,25 +27,25 @@ ifneq ($(shell uname), Darwin) dist_archives += ccache-$(version).tar.xz endif -generated_docs = ccache.1 AUTHORS.html LICENSE.html MANUAL.html NEWS.html +generated_docs = ccache.1 doc/AUTHORS.html LICENSE.html doc/MANUAL.html doc/NEWS.html built_dist_files = $(generated_docs) headers = \ - ccache.h \ - compopt.h \ - conf.h \ - counters.h \ - getopt_long.h \ - hashtable.h \ - hashtable_itr.h \ - hashtable_private.h \ - hashutil.h \ - language.h \ - macroskip.h \ - manifest.h \ - mdfour.h \ - murmurhashneutral2.h \ - system.h \ + src/ccache.h \ + src/compopt.h \ + src/conf.h \ + src/counters.h \ + src/getopt_long.h \ + src/hashtable.h \ + src/hashtable_itr.h \ + src/hashtable_private.h \ + src/hashutil.h \ + src/language.h \ + src/macroskip.h \ + src/manifest.h \ + src/mdfour.h \ + src/murmurhashneutral2.h \ + src/system.h \ unittest/framework.h \ unittest/suites.h \ unittest/util.h @@ -58,13 +58,10 @@ source_dist_files = \ $(base_sources) \ $(headers) \ $(test_sources) \ - AUTHORS.txt \ CONTRIBUTING.md \ GPL-3.0.txt \ LICENSE.txt \ - MANUAL.txt \ Makefile.in \ - NEWS.txt \ README.md \ autogen.sh \ config.guess \ @@ -72,28 +69,31 @@ source_dist_files = \ config.sub \ configure \ configure.ac \ - confitems.gperf \ - confitems_lookup.c \ dev.mk.in \ - envtoconfitems.gperf \ - envtoconfitems_lookup.c \ + doc/AUTHORS.txt \ + doc/MANUAL.txt \ + doc/NEWS.txt \ install-sh \ m4 \ - main.c \ + src/confitems.gperf \ + src/confitems_lookup.c \ + src/envtoconfitems.gperf \ + src/envtoconfitems_lookup.c \ + src/main.c \ + src/zlib/*.c \ + src/zlib/*.h \ test/run \ - test/suites/* \ - zlib/*.c \ - zlib/*.h + test/suites/* dist_files = \ $(addprefix $(srcdir)/, $(source_dist_files)) \ $(built_dist_files) uncrustify_exclude_files = \ - getopt_long.c \ - hashtable.c \ - hashtable_itr.c \ - snprintf.c + src/getopt_long.c \ + src/hashtable.c \ + src/hashtable_itr.c \ + src/snprintf.c ifneq ($(shell sed 's/.*"\(.*\)".*/\1/' version.c 2>/dev/null),$(version)) $(shell echo 'const char CCACHE_VERSION[] = "$(version)";' >version.c) @@ -113,7 +113,7 @@ $(dist_archives): $(dist_files) mkdir $$dir && \ (cd $(srcdir) && \ rsync -r --relative $(source_dist_files) $$dir) && \ - cp $(srcdir)/INSTALL-from-release-archive.md $$dir/INSTALL.md && \ + cp $(srcdir)/doc/INSTALL-from-release-archive.md $$dir/INSTALL.md && \ cp $(built_dist_files) $$dir && \ echo "Remove this file to enable developer mode." >$$dir/dev_mode_disabled && \ (cd $$tmpdir && \ @@ -147,7 +147,7 @@ docs: $(generated_docs) %.xml: %.txt $(ASCIIDOC) -a revnumber=$(version) -d manpage -b docbook $< -ccache.1: MANUAL.xml +ccache.1: doc/MANUAL.xml $(XSLTPROC) --nonet $(MANPAGE_XSL) $< .PHONY: check-syntax @@ -158,11 +158,11 @@ check-syntax: cppcheck: $(CPPCHECK) --suppressions-list=$(CPPCHECK_SUPPRESSIONS) \ --inline-suppr -q --enable=all --force \ - $(non_3pp_sources) main.c $(test_sources) + $(non_3pp_sources) src/main.c $(test_sources) .PHONY: uncrustify uncrustify: - uncrustify -c uncrustify.cfg --no-backup --replace $(filter-out $(uncrustify_exclude_files), $(base_sources)) $(test_sources) + uncrustify -c misc/uncrustify.cfg --no-backup --replace $(filter-out $(uncrustify_exclude_files), $(base_sources)) $(test_sources) .PHONY: analyze analyze: @@ -170,7 +170,7 @@ analyze: $(SCAN_BUILD) --use-cc=$(CC) --status-bugs $(MAKE) -B .PHONY: docker -docker: Dockerfile +docker: misc/Dockerfile $(DOCKER) build $(srcdir) -include .deps/*.d diff --git a/AUTHORS.txt b/doc/AUTHORS.txt similarity index 100% rename from AUTHORS.txt rename to doc/AUTHORS.txt diff --git a/INSTALL-from-release-archive.md b/doc/INSTALL-from-release-archive.md similarity index 100% rename from INSTALL-from-release-archive.md rename to doc/INSTALL-from-release-archive.md diff --git a/INSTALL.md b/doc/INSTALL.md similarity index 100% rename from INSTALL.md rename to doc/INSTALL.md diff --git a/MANUAL.txt b/doc/MANUAL.txt similarity index 100% rename from MANUAL.txt rename to doc/MANUAL.txt diff --git a/NEWS.txt b/doc/NEWS.txt similarity index 100% rename from NEWS.txt rename to doc/NEWS.txt diff --git a/Dockerfile b/misc/Dockerfile similarity index 100% rename from Dockerfile rename to misc/Dockerfile diff --git a/cppcheck-suppressions.txt b/misc/cppcheck-suppressions.txt similarity index 100% rename from cppcheck-suppressions.txt rename to misc/cppcheck-suppressions.txt diff --git a/uncrustify.cfg b/misc/uncrustify.cfg similarity index 100% rename from uncrustify.cfg rename to misc/uncrustify.cfg diff --git a/perf.py b/perf/perf.py similarity index 100% rename from perf.py rename to perf/perf.py diff --git a/args.c b/src/args.c similarity index 100% rename from args.c rename to src/args.c diff --git a/ccache.c b/src/ccache.c similarity index 100% rename from ccache.c rename to src/ccache.c diff --git a/ccache.h b/src/ccache.h similarity index 100% rename from ccache.h rename to src/ccache.h diff --git a/cleanup.c b/src/cleanup.c similarity index 100% rename from cleanup.c rename to src/cleanup.c diff --git a/compopt.c b/src/compopt.c similarity index 100% rename from compopt.c rename to src/compopt.c diff --git a/compopt.h b/src/compopt.h similarity index 100% rename from compopt.h rename to src/compopt.h diff --git a/conf.c b/src/conf.c similarity index 100% rename from conf.c rename to src/conf.c diff --git a/conf.h b/src/conf.h similarity index 100% rename from conf.h rename to src/conf.h diff --git a/confitems.gperf b/src/confitems.gperf similarity index 100% rename from confitems.gperf rename to src/confitems.gperf diff --git a/confitems_lookup.c b/src/confitems_lookup.c similarity index 100% rename from confitems_lookup.c rename to src/confitems_lookup.c diff --git a/counters.c b/src/counters.c similarity index 100% rename from counters.c rename to src/counters.c diff --git a/counters.h b/src/counters.h similarity index 100% rename from counters.h rename to src/counters.h diff --git a/envtoconfitems.gperf b/src/envtoconfitems.gperf similarity index 100% rename from envtoconfitems.gperf rename to src/envtoconfitems.gperf diff --git a/envtoconfitems_lookup.c b/src/envtoconfitems_lookup.c similarity index 100% rename from envtoconfitems_lookup.c rename to src/envtoconfitems_lookup.c diff --git a/execute.c b/src/execute.c similarity index 100% rename from execute.c rename to src/execute.c diff --git a/exitfn.c b/src/exitfn.c similarity index 100% rename from exitfn.c rename to src/exitfn.c diff --git a/getopt_long.c b/src/getopt_long.c similarity index 100% rename from getopt_long.c rename to src/getopt_long.c diff --git a/getopt_long.h b/src/getopt_long.h similarity index 100% rename from getopt_long.h rename to src/getopt_long.h diff --git a/hash.c b/src/hash.c similarity index 100% rename from hash.c rename to src/hash.c diff --git a/hashtable.c b/src/hashtable.c similarity index 100% rename from hashtable.c rename to src/hashtable.c diff --git a/hashtable.h b/src/hashtable.h similarity index 100% rename from hashtable.h rename to src/hashtable.h diff --git a/hashtable_itr.c b/src/hashtable_itr.c similarity index 100% rename from hashtable_itr.c rename to src/hashtable_itr.c diff --git a/hashtable_itr.h b/src/hashtable_itr.h similarity index 100% rename from hashtable_itr.h rename to src/hashtable_itr.h diff --git a/hashtable_private.h b/src/hashtable_private.h similarity index 100% rename from hashtable_private.h rename to src/hashtable_private.h diff --git a/hashutil.c b/src/hashutil.c similarity index 100% rename from hashutil.c rename to src/hashutil.c diff --git a/hashutil.h b/src/hashutil.h similarity index 100% rename from hashutil.h rename to src/hashutil.h diff --git a/language.c b/src/language.c similarity index 100% rename from language.c rename to src/language.c diff --git a/language.h b/src/language.h similarity index 100% rename from language.h rename to src/language.h diff --git a/lockfile.c b/src/lockfile.c similarity index 100% rename from lockfile.c rename to src/lockfile.c diff --git a/macroskip.h b/src/macroskip.h similarity index 100% rename from macroskip.h rename to src/macroskip.h diff --git a/main.c b/src/main.c similarity index 100% rename from main.c rename to src/main.c diff --git a/manifest.c b/src/manifest.c similarity index 100% rename from manifest.c rename to src/manifest.c diff --git a/manifest.h b/src/manifest.h similarity index 100% rename from manifest.h rename to src/manifest.h diff --git a/mdfour.c b/src/mdfour.c similarity index 100% rename from mdfour.c rename to src/mdfour.c diff --git a/mdfour.h b/src/mdfour.h similarity index 100% rename from mdfour.h rename to src/mdfour.h diff --git a/murmurhashneutral2.c b/src/murmurhashneutral2.c similarity index 100% rename from murmurhashneutral2.c rename to src/murmurhashneutral2.c diff --git a/murmurhashneutral2.h b/src/murmurhashneutral2.h similarity index 100% rename from murmurhashneutral2.h rename to src/murmurhashneutral2.h diff --git a/snprintf.c b/src/snprintf.c similarity index 100% rename from snprintf.c rename to src/snprintf.c diff --git a/stats.c b/src/stats.c similarity index 100% rename from stats.c rename to src/stats.c diff --git a/system.h b/src/system.h similarity index 100% rename from system.h rename to src/system.h diff --git a/unify.c b/src/unify.c similarity index 100% rename from unify.c rename to src/unify.c diff --git a/util.c b/src/util.c similarity index 100% rename from util.c rename to src/util.c diff --git a/zlib/README b/src/zlib/README similarity index 100% rename from zlib/README rename to src/zlib/README diff --git a/zlib/adler32.c b/src/zlib/adler32.c similarity index 100% rename from zlib/adler32.c rename to src/zlib/adler32.c diff --git a/zlib/crc32.c b/src/zlib/crc32.c similarity index 100% rename from zlib/crc32.c rename to src/zlib/crc32.c diff --git a/zlib/crc32.h b/src/zlib/crc32.h similarity index 100% rename from zlib/crc32.h rename to src/zlib/crc32.h diff --git a/zlib/deflate.c b/src/zlib/deflate.c similarity index 100% rename from zlib/deflate.c rename to src/zlib/deflate.c diff --git a/zlib/deflate.h b/src/zlib/deflate.h similarity index 100% rename from zlib/deflate.h rename to src/zlib/deflate.h diff --git a/zlib/gzclose.c b/src/zlib/gzclose.c similarity index 100% rename from zlib/gzclose.c rename to src/zlib/gzclose.c diff --git a/zlib/gzguts.h b/src/zlib/gzguts.h similarity index 100% rename from zlib/gzguts.h rename to src/zlib/gzguts.h diff --git a/zlib/gzlib.c b/src/zlib/gzlib.c similarity index 100% rename from zlib/gzlib.c rename to src/zlib/gzlib.c diff --git a/zlib/gzread.c b/src/zlib/gzread.c similarity index 100% rename from zlib/gzread.c rename to src/zlib/gzread.c diff --git a/zlib/gzwrite.c b/src/zlib/gzwrite.c similarity index 100% rename from zlib/gzwrite.c rename to src/zlib/gzwrite.c diff --git a/zlib/inffast.c b/src/zlib/inffast.c similarity index 100% rename from zlib/inffast.c rename to src/zlib/inffast.c diff --git a/zlib/inffast.h b/src/zlib/inffast.h similarity index 100% rename from zlib/inffast.h rename to src/zlib/inffast.h diff --git a/zlib/inffixed.h b/src/zlib/inffixed.h similarity index 100% rename from zlib/inffixed.h rename to src/zlib/inffixed.h diff --git a/zlib/inflate.c b/src/zlib/inflate.c similarity index 100% rename from zlib/inflate.c rename to src/zlib/inflate.c diff --git a/zlib/inflate.h b/src/zlib/inflate.h similarity index 100% rename from zlib/inflate.h rename to src/zlib/inflate.h diff --git a/zlib/inftrees.c b/src/zlib/inftrees.c similarity index 100% rename from zlib/inftrees.c rename to src/zlib/inftrees.c diff --git a/zlib/inftrees.h b/src/zlib/inftrees.h similarity index 100% rename from zlib/inftrees.h rename to src/zlib/inftrees.h diff --git a/zlib/trees.c b/src/zlib/trees.c similarity index 100% rename from zlib/trees.c rename to src/zlib/trees.c diff --git a/zlib/trees.h b/src/zlib/trees.h similarity index 100% rename from zlib/trees.h rename to src/zlib/trees.h diff --git a/zlib/zconf.h b/src/zlib/zconf.h similarity index 100% rename from zlib/zconf.h rename to src/zlib/zconf.h diff --git a/zlib/zlib.h b/src/zlib/zlib.h similarity index 100% rename from zlib/zlib.h rename to src/zlib/zlib.h diff --git a/zlib/zutil.c b/src/zlib/zutil.c similarity index 100% rename from zlib/zutil.c rename to src/zlib/zutil.c diff --git a/zlib/zutil.h b/src/zlib/zutil.h similarity index 100% rename from zlib/zutil.h rename to src/zlib/zutil.h diff --git a/unittest/framework.c b/unittest/framework.c index ccaa7853f..404367a9a 100644 --- a/unittest/framework.c +++ b/unittest/framework.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -14,7 +14,6 @@ // this program; if not, write to the Free Software Foundation, Inc., 51 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#include "../ccache.h" #include "framework.h" #include "util.h" diff --git a/unittest/framework.h b/unittest/framework.h index d1aa6a715..2f36c736e 100644 --- a/unittest/framework.h +++ b/unittest/framework.h @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -17,7 +17,7 @@ #ifndef TEST_FRAMEWORK_H #define TEST_FRAMEWORK_H -#include "../ccache.h" +#include "../src/ccache.h" // ============================================================================ diff --git a/unittest/main.c b/unittest/main.c index 965ffeda6..7b59788a6 100644 --- a/unittest/main.c +++ b/unittest/main.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -18,7 +18,7 @@ #ifdef HAVE_GETOPT_LONG #include #else -#include "../getopt_long.h" +#include "../src/getopt_long.h" #endif // *INDENT-OFF* disable uncrustify diff --git a/unittest/test_args.c b/unittest/test_args.c index 6b11dc456..9815f14f5 100644 --- a/unittest/test_args.c +++ b/unittest/test_args.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,7 +16,7 @@ // This file contains tests for the functions operating on struct args. -#include "../ccache.h" +#include "../src/ccache.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_argument_processing.c b/unittest/test_argument_processing.c index 18ac0ffc9..bb49913b9 100644 --- a/unittest/test_argument_processing.c +++ b/unittest/test_argument_processing.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2017 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,8 +16,8 @@ // This file contains tests for the processing of compiler arguments. -#include "../ccache.h" -#include "../conf.h" +#include "../src/ccache.h" +#include "../src/conf.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_compopt.c b/unittest/test_compopt.c index be345aa2c..2efda5021 100644 --- a/unittest/test_compopt.c +++ b/unittest/test_compopt.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,8 +16,8 @@ // This file contains tests for the compopt_* functions. -#include "../ccache.h" -#include "../compopt.h" +#include "../src/ccache.h" +#include "../src/compopt.h" #include "framework.h" TEST_SUITE(compopt) diff --git a/unittest/test_conf.c b/unittest/test_conf.c index 96e734732..9f88133bc 100644 --- a/unittest/test_conf.c +++ b/unittest/test_conf.c @@ -14,7 +14,7 @@ // this program; if not, write to the Free Software Foundation, Inc., 51 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#include "../conf.h" +#include "../src/conf.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_counters.c b/unittest/test_counters.c index 1705b7621..8ce4ab9c2 100644 --- a/unittest/test_counters.c +++ b/unittest/test_counters.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2011 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -14,8 +14,8 @@ // this program; if not, write to the Free Software Foundation, Inc., 51 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#include "../ccache.h" -#include "../counters.h" +#include "../src/ccache.h" +#include "../src/counters.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_hash.c b/unittest/test_hash.c index 3fe3d6951..674bca6fa 100644 --- a/unittest/test_hash.c +++ b/unittest/test_hash.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,7 +16,7 @@ // This file contains tests for functions in hash.c. -#include "../ccache.h" +#include "../src/ccache.h" #include "framework.h" TEST_SUITE(hash) diff --git a/unittest/test_hashutil.c b/unittest/test_hashutil.c index 22930c96e..dcbaa842a 100644 --- a/unittest/test_hashutil.c +++ b/unittest/test_hashutil.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,8 +16,8 @@ // This file contains tests for functions in hashutil.c. -#include "../ccache.h" -#include "../hashutil.h" +#include "../src/ccache.h" +#include "../src/hashutil.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_lockfile.c b/unittest/test_lockfile.c index cb7617683..98811c68f 100644 --- a/unittest/test_lockfile.c +++ b/unittest/test_lockfile.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,7 +16,7 @@ // This file contains tests for functions in lockfile.c. -#include "../ccache.h" +#include "../src/ccache.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_stats.c b/unittest/test_stats.c index 2815b9e9b..73b39a0d6 100644 --- a/unittest/test_stats.c +++ b/unittest/test_stats.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2011 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -16,8 +16,8 @@ // This file contains tests for statistics handling. -#include "../ccache.h" -#include "../counters.h" +#include "../src/ccache.h" +#include "../src/counters.h" #include "framework.h" #include "util.h" diff --git a/unittest/test_util.c b/unittest/test_util.c index b6c4c2eb8..38b441911 100644 --- a/unittest/test_util.c +++ b/unittest/test_util.c @@ -16,7 +16,7 @@ // This file contains tests for functions in util.c. -#include "../ccache.h" +#include "../src/ccache.h" #include "framework.h" TEST_SUITE(util) diff --git a/unittest/util.c b/unittest/util.c index 826eebdcb..1e52c525c 100644 --- a/unittest/util.c +++ b/unittest/util.c @@ -1,4 +1,4 @@ -// Copyright (C) 2010-2016 Joel Rosdahl +// Copyright (C) 2010-2018 Joel Rosdahl // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the Free @@ -14,7 +14,7 @@ // this program; if not, write to the Free Software Foundation, Inc., 51 // Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -#include "../system.h" +#include "../src/system.h" #include "util.h" #ifdef _WIN32