From 0c6d62cf27b3b22fa60bddad16ea8e8d062e4a99 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 1 Feb 2014 12:26:38 +0100 Subject: [PATCH] Remove Automakefiles --- Makefile.am | 42 ------------ corepkgs/Makefile.am | 12 ---- doc/Makefile.am | 1 - doc/manual/Makefile.am | 117 -------------------------------- misc/Makefile.am | 1 - misc/emacs/Makefile.am | 5 -- perl/Makefile.am | 38 ----------- scripts/Makefile.am | 41 ----------- src/Makefile.am | 3 - src/boost/format/Makefile.am | 12 ---- src/bsdiff-4.3/Makefile.am | 13 ---- src/libexpr/Makefile.am | 40 ----------- src/libmain/Makefile.am | 11 --- src/libstore/Makefile.am | 33 --------- src/libutil/Makefile.am | 18 ----- src/nix-daemon/Makefile.am | 12 ---- src/nix-env/Makefile.am | 12 ---- src/nix-hash/Makefile.am | 8 --- src/nix-instantiate/Makefile.am | 10 --- src/nix-log2xml/Makefile.am | 17 ----- src/nix-store/Makefile.am | 12 ---- tests/Makefile.am | 52 -------------- 22 files changed, 510 deletions(-) delete mode 100644 Makefile.am delete mode 100644 corepkgs/Makefile.am delete mode 100644 doc/Makefile.am delete mode 100644 doc/manual/Makefile.am delete mode 100644 misc/Makefile.am delete mode 100644 misc/emacs/Makefile.am delete mode 100644 perl/Makefile.am delete mode 100644 scripts/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/boost/format/Makefile.am delete mode 100644 src/bsdiff-4.3/Makefile.am delete mode 100644 src/libexpr/Makefile.am delete mode 100644 src/libmain/Makefile.am delete mode 100644 src/libstore/Makefile.am delete mode 100644 src/libutil/Makefile.am delete mode 100644 src/nix-daemon/Makefile.am delete mode 100644 src/nix-env/Makefile.am delete mode 100644 src/nix-hash/Makefile.am delete mode 100644 src/nix-instantiate/Makefile.am delete mode 100644 src/nix-log2xml/Makefile.am delete mode 100644 src/nix-store/Makefile.am delete mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index d3ef224de..000000000 --- a/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -SUBDIRS = src perl scripts corepkgs doc misc tests -EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh \ - NEWS version misc/systemd/nix-daemon.service - -pkginclude_HEADERS = config.h - -include ./substitute.mk - -nix.spec: nix.spec.in - -install-data-local: init-state - $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix - $(INSTALL) -d $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/ - -if INIT_STATE - -# For setuid operation, you can enable the following: -# INIT_FLAGS = -g @NIX_GROUP@ -o @NIX_USER@ -# GROUP_WRITABLE = -m 775 - -init-state: - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/db - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/log/nix - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/log/nix/drvs - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/profiles - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/gcroots - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/temproots - $(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/userpool - -$(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(storedir) - $(INSTALL) $(INIT_FLAGS) $(GROUP_WRITABLE) -d $(DESTDIR)$(localstatedir)/nix/manifests - -else - -init-state: - -endif - -NEWS: - $(MAKE) -C doc/manual NEWS.txt - cp $(srcdir)/doc/manual/NEWS.txt NEWS diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am deleted file mode 100644 index 111b667d0..000000000 --- a/corepkgs/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -all-local: config.nix - -files = nar.nix buildenv.nix buildenv.pl unpack-channel.nix derivation.nix fetchurl.nix \ - imported-drv-to-derivation.nix - -install-exec-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs - $(INSTALL_DATA) config.nix $(files) $(DESTDIR)$(datadir)/nix/corepkgs - -include ../substitute.mk - -EXTRA_DIST = config.nix.in $(files) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index e76efafdb..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = manual diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am deleted file mode 100644 index 56be7e1b8..000000000 --- a/doc/manual/Makefile.am +++ /dev/null @@ -1,117 +0,0 @@ -XMLLINT = $(xmllint) --nonet $(xmlflags) -XSLTPROC = $(xsltproc) --nonet $(xmlflags) \ - --param section.autolabel 1 \ - --param section.label.includes.component.label 1 \ - --param html.stylesheet \'style.css\' \ - --param xref.with.number.and.title 1 \ - --param toc.section.depth 3 \ - --param admon.style \'\' \ - --param callout.graphics.extension \'.gif\' \ - --param contrib.inline.enabled 0 - -dblatex_opts = \ - -P doc.collab.show=0 \ - -P latex.output.revhistory=0 - -# Note: we use GIF for now, since the PNGs shipped with Docbook aren't -# transparent. - -man1_MANS = nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \ - nix-collect-garbage.1 nix-push.1 nix-pull.1 \ - nix-prefetch-url.1 nix-channel.1 \ - nix-install-package.1 nix-hash.1 nix-copy-closure.1 - -man5_MANS = nix.conf.5 - -man8_MANS = nix-daemon.8 - -FIGURES = figures/user-environments.png - -MANUAL_SRCS = manual.xml introduction.xml installation.xml \ - package-management.xml writing-nix-expressions.xml builtins.xml \ - build-farm.xml \ - $(man1_MANS:.1=.xml) $(man8_MANS:.8=.xml) \ - troubleshooting.xml bugs.xml opt-common.xml opt-common-syn.xml opt-inst-syn.xml \ - env-common.xml quick-start.xml nix-lang-ref.xml glossary.xml \ - conf-file.xml release-notes.xml \ - style.css images - -# Do XInclude processing. -manual.xmli: $(MANUAL_SRCS) version.txt - $(XMLLINT) --xinclude $< -o $@.tmp - mv $@.tmp $@ - -# Note: RelaxNG validation requires xmllint >= 2.7.4. -manual.is-valid: manual.xmli - $(XSLTPROC) --novalid --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \ - $(XMLLINT) --noout --relaxng $(docbookrng)/docbook.rng - - touch $@ - -version.txt: - echo -n $(VERSION) > version.txt - -man $(MANS): manual.is-valid - $(XSLTPROC) --stringparam profile.condition manpage \ - $(docbookxsl)/profiling/profile.xsl manual.xmli 2> /dev/null | \ - $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl - - -manual.html: $(MANUAL_SRCS) manual.is-valid images - $(XSLTPROC) --xinclude --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl manual.xml | \ - $(XSLTPROC) --output manual.html $(docbookxsl)/html/docbook.xsl - - -manual.pdf: $(MANUAL_SRCS) manual.is-valid images - if test "$(dblatex)" != ""; then \ - $(XSLTPROC) --xinclude --stringparam profile.condition manual \ - $(docbookxsl)/profiling/profile.xsl manual.xml | \ - $(dblatex) -o manual.pdf $(dblatex_opts) -; \ - else \ - echo "Please install dblatex and rerun configure."; \ - exit 1; \ - fi - - -NEWS_OPTS = \ - --stringparam generate.toc "article nop" \ - --stringparam section.autolabel.max.depth 0 \ - --stringparam header.rule 0 - -NEWS.html: release-notes.xml - $(XSLTPROC) --xinclude --output $@ $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl release-notes.xml - -NEWS.txt: release-notes.xml - $(XSLTPROC) --xinclude quote-literals.xsl release-notes.xml | \ - $(XSLTPROC) --output $@.tmp.html $(NEWS_OPTS) \ - $(docbookxsl)/html/docbook.xsl - - LANG=en_US $(w3m) -dump $@.tmp.html > $@ - rm $@.tmp.html - - -all-local: manual.html NEWS.html NEWS.txt - -install-data-local: manual.html - $(INSTALL) -d $(DESTDIR)$(docdir)/manual - $(INSTALL_DATA) manual.html $(DESTDIR)$(docdir)/manual - ln -sf manual.html $(DESTDIR)$(docdir)/manual/index.html - $(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/manual - cp -r images $(DESTDIR)$(docdir)/manual/images - $(INSTALL) -d $(DESTDIR)$(docdir)/manual/figures - $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(docdir)/manual/figures - $(INSTALL) -d $(DESTDIR)$(docdir)/release-notes - $(INSTALL_DATA) NEWS.html $(DESTDIR)$(docdir)/release-notes/index.html - $(INSTALL_DATA) style.css $(DESTDIR)$(docdir)/release-notes/ - -images: - mkdir images -# cp $(docbookxsl)/images/*.gif images - mkdir images/callouts - cp $(docbookxsl)/images/callouts/*.gif images/callouts - chmod -R +w images - -KEEP = manual.html manual.xmli manual.is-valid version.txt $(MANS) NEWS.html NEWS.txt - -EXTRA_DIST = $(MANUAL_SRCS) $(FIGURES) $(KEEP) - -DISTCLEANFILES = $(KEEP) diff --git a/misc/Makefile.am b/misc/Makefile.am deleted file mode 100644 index ef10d1e98..000000000 --- a/misc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = emacs diff --git a/misc/emacs/Makefile.am b/misc/emacs/Makefile.am deleted file mode 100644 index 49f19fe50..000000000 --- a/misc/emacs/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -EXTRA_DIST = nix-mode.el - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/emacs/site-lisp - $(INSTALL_DATA) $(srcdir)/nix-mode.el $(DESTDIR)$(datadir)/emacs/site-lisp diff --git a/perl/Makefile.am b/perl/Makefile.am deleted file mode 100644 index b8e60bc2d..000000000 --- a/perl/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -PERL_MODULES = lib/Nix/Store.pm lib/Nix/Manifest.pm lib/Nix/GeneratePatches.pm lib/Nix/SSH.pm lib/Nix/CopyClosure.pm lib/Nix/Config.pm.in lib/Nix/Utils.pm lib/Nix/Crypto.pm - -all: $(PERL_MODULES:.in=) - -install-exec-local: $(PERL_MODULES:.in=) install-perl-xs - $(INSTALL) -d $(DESTDIR)$(perllibdir)/Nix - $(INSTALL_DATA) $(PERL_MODULES:.in=) $(DESTDIR)$(perllibdir)/Nix - -if PERL_BINDINGS -install-perl-xs: - $(INSTALL) -d $(DESTDIR)$(perllibdir)/auto/Nix/Store - ln -sfn $(pkglibdir)/libNixStore$(dynlib_suffix) $(DESTDIR)$(perllibdir)/auto/Nix/Store/Store$(dynlib_suffix) - -# Awful hackery to get libtool to build Perl XS bindings. -pkglib_LTLIBRARIES = libNixStore.la - -nodist_libNixStore_la_SOURCES = lib/Nix/Store.cc - -CLEANFILES = lib/Nix/Store.cc - -libNixStore_la_LIBADD = $(top_builddir)/src/libstore/libstore.la - -AM_CXXFLAGS = \ - -I$(top_srcdir)/src -I$(top_srcdir)/src/libutil -I$(top_srcdir)/src/libstore \ - -I$(shell $(perl) -e 'use Config; print $$Config{archlibexp};')/CORE \ - -D_FILE_OFFSET_BITS=64 - -lib/Nix/Store.cc: lib/Nix/Store.xs - $(INSTALL) -d lib/Nix - xsubpp $^ -output $@ - -else -install-perl-xs: -endif - -EXTRA_DIST = $(PERL_MODULES) lib/Nix/Store.xs - -include ../substitute.mk diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index d9f39aad1..000000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1,41 +0,0 @@ -bin_SCRIPTS = nix-collect-garbage \ - nix-pull nix-push nix-prefetch-url \ - nix-install-package nix-channel nix-build \ - nix-copy-closure nix-generate-patches - -noinst_SCRIPTS = nix-profile.sh \ - find-runtime-roots.pl build-remote.pl nix-reduce-build \ - copy-from-other-stores.pl nix-http-export.cgi - -profiledir = $(sysconfdir)/profile.d - -install-exec-local: download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl find-runtime-roots.pl - $(INSTALL) -d $(DESTDIR)$(profiledir) - $(INSTALL_DATA) nix-profile.sh $(DESTDIR)$(profiledir)/nix.sh - $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix - $(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix - $(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix - $(INSTALL) -d $(DESTDIR)$(libexecdir)/nix/substituters - $(INSTALL_PROGRAM) download-using-manifests.pl copy-from-other-stores.pl download-from-binary-cache.pl $(DESTDIR)$(libexecdir)/nix/substituters - $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix - ln -sf nix-build $(DESTDIR)$(bindir)/nix-shell - -include ../substitute.mk - -EXTRA_DIST = nix-collect-garbage.in \ - nix-pull.in nix-push.in nix-profile.sh.in \ - nix-prefetch-url.in nix-install-package.in \ - nix-channel.in \ - nix-build.in \ - download-using-manifests.pl.in \ - copy-from-other-stores.pl.in \ - download-from-binary-cache.pl.in \ - nix-copy-closure.in \ - find-runtime-roots.pl.in \ - build-remote.pl.in \ - nix-reduce-build.in \ - nix-http-export.cgi.in \ - nix-generate-patches.in - -clean: - rm -f $(bin_SCRIPTS) $(noinst_SCRIPTS) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index a5e411b9e..000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = boost libutil libstore libmain nix-store nix-hash \ - libexpr nix-instantiate nix-env nix-daemon \ - nix-log2xml bsdiff-4.3 diff --git a/src/boost/format/Makefile.am b/src/boost/format/Makefile.am deleted file mode 100644 index 13e23d315..000000000 --- a/src/boost/format/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -pkglib_LTLIBRARIES = libformat.la - -libformat_la_SOURCES = format_implementation.cc free_funcs.cc \ - parsing.cc - -pkginclude_HEADERS = exceptions.hpp feed_args.hpp format_class.hpp \ - format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \ - macros_default.hpp - -pkgincludedir = ${includedir}/nix/boost/format - -AM_CXXFLAGS = -Wall -I$(srcdir)/../.. diff --git a/src/bsdiff-4.3/Makefile.am b/src/bsdiff-4.3/Makefile.am deleted file mode 100644 index 62315333a..000000000 --- a/src/bsdiff-4.3/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -EXTRA_DIST = compat-include - -libexec_PROGRAMS = bsdiff bspatch - -bsdiff_SOURCES = bsdiff.c - -bsdiff_LDADD = -lbz2 - -bspatch_SOURCES = bspatch.c - -bspatch_LDADD = -lbz2 - -AM_CFLAGS = -O3 ${bsddiff_compat_include} diff --git a/src/libexpr/Makefile.am b/src/libexpr/Makefile.am deleted file mode 100644 index 7edbe7715..000000000 --- a/src/libexpr/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -pkglib_LTLIBRARIES = libexpr.la - -libexpr_la_SOURCES = \ - nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \ - get-drvs.cc attr-path.cc value-to-xml.cc value-to-json.cc \ - common-opts.cc names.cc - -pkginclude_HEADERS = \ - nixexpr.hh eval.hh eval-inline.hh lexer-tab.hh parser-tab.hh \ - get-drvs.hh attr-path.hh value-to-xml.hh value-to-json.hh \ - common-opts.hh names.hh symbol-table.hh value.hh - -libexpr_la_LIBADD = ../libutil/libutil.la ../libstore/libstore.la \ - ../boost/format/libformat.la @BDW_GC_LIBS@ - -BUILT_SOURCES = \ - parser-tab.hh lexer-tab.hh parser-tab.cc lexer-tab.cc - -EXTRA_DIST = lexer.l parser.y - -AM_CXXFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libutil -I$(srcdir)/../libstore - - -# Parser generation. - -parser-tab.cc parser-tab.hh: parser.y - $(bison) -v -o parser-tab.cc $(srcdir)/parser.y -d - -lexer-tab.cc lexer-tab.hh: lexer.l - $(flex) --outfile lexer-tab.cc --header-file=lexer-tab.hh $(srcdir)/lexer.l - - -# SDF stuff (not built by default). -nix.tbl: nix.sdf - sdf2table -m Nix -s -i nix.sdf -o nix.tbl - -test.ast: test.nix nix.tbl - sglri -p nix.tbl -i test.nix -o test.ast diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am deleted file mode 100644 index 75b9d83dc..000000000 --- a/src/libmain/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -pkglib_LTLIBRARIES = libmain.la - -libmain_la_SOURCES = shared.cc stack.cc - -libmain_la_LIBADD = ../libstore/libstore.la @BDW_GC_LIBS@ - -pkginclude_HEADERS = shared.hh - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore diff --git a/src/libstore/Makefile.am b/src/libstore/Makefile.am deleted file mode 100644 index 3dfb1e0c3..000000000 --- a/src/libstore/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -pkglib_LTLIBRARIES = libstore.la - -libstore_la_SOURCES = \ - store-api.cc local-store.cc remote-store.cc derivations.cc build.cc misc.cc \ - globals.cc references.cc pathlocks.cc gc.cc \ - optimise-store.cc - -pkginclude_HEADERS = \ - store-api.hh local-store.hh remote-store.hh derivations.hh misc.hh \ - globals.hh references.hh pathlocks.hh \ - worker-protocol.hh - -libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @SQLITE3_LIBS@ -lbz2 - -EXTRA_DIST = schema.sql - -AM_CXXFLAGS = -Wall \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -DNIX_STORE_DIR=\"$(storedir)\" \ - -DNIX_DATA_DIR=\"$(datadir)\" \ - -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ - -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ - -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ - -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ - -DNIX_BIN_DIR=\"$(bindir)\" \ - -DNIX_VERSION=\"$(VERSION)\" \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore - -local-store.lo: schema.sql.hh - -%.sql.hh: %.sql - sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $< > $@ || (rm $@ && exit 1) diff --git a/src/libutil/Makefile.am b/src/libutil/Makefile.am deleted file mode 100644 index 0c4073e66..000000000 --- a/src/libutil/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -pkglib_LTLIBRARIES = libutil.la - -libutil_la_SOURCES = util.cc hash.cc serialise.cc \ - archive.cc xml-writer.cc affinity.cc - -libutil_la_LIBADD = ../boost/format/libformat.la - -pkginclude_HEADERS = util.hh hash.hh serialise.hh \ - archive.hh xml-writer.hh types.hh affinity.hh - -if !HAVE_OPENSSL -libutil_la_SOURCES += \ - md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h -else -libutil_la_LIBADD += @OPENSSL_LIBS@ -endif - -AM_CXXFLAGS = -Wall -I$(srcdir)/.. diff --git a/src/nix-daemon/Makefile.am b/src/nix-daemon/Makefile.am deleted file mode 100644 index b8e9f4a06..000000000 --- a/src/nix-daemon/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-daemon - -nix_daemon_SOURCES = nix-daemon.cc -nix_daemon_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore -I$(srcdir)/../libmain - -install-exec-local: - ln -sf nix-daemon $(DESTDIR)$(bindir)/nix-worker diff --git a/src/nix-env/Makefile.am b/src/nix-env/Makefile.am deleted file mode 100644 index 4d3bd111d..000000000 --- a/src/nix-env/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-env - -nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh - -nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. \ - -I$(srcdir)/../libutil -I$(srcdir)/../libstore \ - -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr diff --git a/src/nix-hash/Makefile.am b/src/nix-hash/Makefile.am deleted file mode 100644 index ef7bb8423..000000000 --- a/src/nix-hash/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -bin_PROGRAMS = nix-hash - -nix_hash_SOURCES = nix-hash.cc -nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore -I$(srcdir)/../libmain diff --git a/src/nix-instantiate/Makefile.am b/src/nix-instantiate/Makefile.am deleted file mode 100644 index 96978f36c..000000000 --- a/src/nix-instantiate/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -bin_PROGRAMS = nix-instantiate - -nix_instantiate_SOURCES = nix-instantiate.cc -nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \ - ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore \ - -I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr diff --git a/src/nix-log2xml/Makefile.am b/src/nix-log2xml/Makefile.am deleted file mode 100644 index c538fda08..000000000 --- a/src/nix-log2xml/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -bin_PROGRAMS = nix-log2xml - -nix_log2xml_SOURCES = log2xml.cc - -%.xml: %.log nix-log2xml - ./nix-log2xml < $< > $@ - -%.html: %.xml mark-errors.xsl log2html.xsl - $(xsltproc) mark-errors.xsl $< | $(xsltproc) log2html.xsl - > $@ - -LOG2HTML = $(srcdir)/mark-errors.xsl $(srcdir)/log2html.xsl $(srcdir)/treebits.js - -EXTRA_DIST = $(LOG2HTML) - -install-data-local: - $(INSTALL) -d $(DESTDIR)$(datadir)/nix/log2html - $(INSTALL_DATA) $(LOG2HTML) $(DESTDIR)$(datadir)/nix/log2html diff --git a/src/nix-store/Makefile.am b/src/nix-store/Makefile.am deleted file mode 100644 index fca9eff7c..000000000 --- a/src/nix-store/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -bin_PROGRAMS = nix-store - -nix_store_SOURCES = \ - nix-store.cc dotgraph.cc dotgraph.hh \ - xmlgraph.cc xmlgraph.hh - -nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \ - ../boost/format/libformat.la -lbz2 - -AM_CXXFLAGS = \ - -I$(srcdir)/.. -I$(srcdir)/../libutil \ - -I$(srcdir)/../libstore -I$(srcdir)/../libmain diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 38cf7b1bd..000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -TESTS_ENVIRONMENT = NIX_REMOTE= $(bash) -e - -extra1 = $(shell pwd)/test-tmp/shared - -TESTS = init.sh hash.sh lang.sh add.sh simple.sh dependencies.sh \ - parallel.sh build-hook.sh substitutes.sh substitutes2.sh \ - fallback.sh nix-push.sh gc.sh gc-concurrent.sh verify.sh nix-pull.sh \ - referrers.sh user-envs.sh logging.sh nix-build.sh misc.sh fixed.sh \ - gc-runtime.sh install-package.sh check-refs.sh filter-source.sh \ - remote-store.sh export.sh export-graph.sh negative-caching.sh \ - binary-patching.sh timeout.sh secure-drv-outputs.sh nix-channel.sh \ - multiple-outputs.sh import-derivation.sh fetchurl.sh optimise-store.sh \ - binary-cache.sh nix-profile.sh - -XFAIL_TESTS = - -profiledir = $(sysconfdir)/profile.d - -include ../substitute.mk - -$(TESTS): common.sh config.nix - -EXTRA_DIST = $(TESTS) \ - config.nix.in \ - simple.nix simple.builder.sh \ - hash-check.nix \ - dependencies.nix dependencies.builder*.sh \ - parallel.nix parallel.builder.sh \ - build-hook.nix build-hook.hook.sh \ - substituter.sh substituter2.sh \ - gc-concurrent.nix gc-concurrent.builder.sh gc-concurrent2.builder.sh \ - user-envs.nix user-envs.builder.sh \ - fixed.nix fixed.builder1.sh fixed.builder2.sh \ - gc-runtime.nix \ - check-refs.nix \ - filter-source.nix \ - export-graph.nix \ - negative-caching.nix \ - binary-patching.nix \ - timeout.nix timeout.builder.sh \ - secure-drv-outputs.nix \ - multiple-outputs.nix \ - import-derivation.nix \ - fetchurl.nix \ - $(wildcard lang/*.nix) $(wildcard lang/*.exp) $(wildcard lang/*.exp.xml) $(wildcard lang/*.flags) $(wildcard lang/dir*/*.nix) \ - common.sh.in - -# Hacky. -check-am: - @echo "Warning: Nix has no 'make check'. Please install Nix and run 'make installcheck' instead." - -installcheck: check-TESTS