lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

* Support for srcdir != builddir (NIX-41).

Browse source
This commit is contained in:
Eelco Dolstra 2006-05-12 11:47:45 +00:00
parent 9d72bf8835
commit b5988004d6
16 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile.am
View file

@ -14,9 +14,9 @@ relname:
install-data-local: init-state install-data-local: init-state
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix $(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix
$(INSTALL_DATA) nix.conf.example $(DESTDIR)$(sysconfdir)/nix $(INSTALL_DATA) $(srcdir)/nix.conf.example $(DESTDIR)$(sysconfdir)/nix
if ! test -e $(DESTDIR)$(sysconfdir)/nix/nix.conf; then \ if ! test -e $(DESTDIR)$(sysconfdir)/nix/nix.conf; then \
$(INSTALL_DATA) nix.conf.example $(DESTDIR)$(sysconfdir)/nix/nix.conf; \ $(INSTALL_DATA) $(srcdir)/nix.conf.example $(DESTDIR)$(sysconfdir)/nix/nix.conf; \
fi fi
if INIT_STATE if INIT_STATE
@ -50,4 +50,4 @@ svn-revision:
all-local: NEWS all-local: NEWS
NEWS: doc/manual/NEWS.txt NEWS: doc/manual/NEWS.txt
cp doc/manual/NEWS.txt NEWS cp $(srcdir)/doc/manual/NEWS.txt NEWS

2
corepkgs/buildenv/Makefile.am
View file

@ -3,7 +3,7 @@ all-local: builder.pl
install-exec-local: install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
$(INSTALL_DATA) default.nix $(DESTDIR)$(datadir)/nix/corepkgs/buildenv $(INSTALL_DATA) $(srcdir)/default.nix $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
$(INSTALL_PROGRAM) builder.pl $(DESTDIR)$(datadir)/nix/corepkgs/buildenv $(INSTALL_PROGRAM) builder.pl $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
include ../../substitute.mk include ../../substitute.mk

2
corepkgs/channels/Makefile.am
View file

@ -3,7 +3,7 @@ all-local: unpack.sh
install-exec-local: install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/channels $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/channels
$(INSTALL_DATA) unpack.nix $(DESTDIR)$(datadir)/nix/corepkgs/channels $(INSTALL_DATA) $(srcdir)/unpack.nix $(DESTDIR)$(datadir)/nix/corepkgs/channels
$(INSTALL_PROGRAM) unpack.sh $(DESTDIR)$(datadir)/nix/corepkgs/channels $(INSTALL_PROGRAM) unpack.sh $(DESTDIR)$(datadir)/nix/corepkgs/channels
include ../../substitute.mk include ../../substitute.mk

2
corepkgs/nar/Makefile.am
View file

@ -3,7 +3,7 @@ all-local: nar.sh
install-exec-local: install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/nar $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/nar
$(INSTALL_DATA) nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar $(INSTALL_DATA) $(srcdir)/nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar
$(INSTALL_PROGRAM) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar $(INSTALL_PROGRAM) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar
include ../../substitute.mk include ../../substitute.mk

6
externals/Makefile.am vendored
View file

@ -10,7 +10,7 @@ $(DB).tar.gz:
false false
$(DB): $(DB).tar.gz $(DB): $(DB).tar.gz
gunzip < $(DB).tar.gz | tar xvf - gunzip < $(srcdir)/$(DB).tar.gz | tar xvf -
have-db: have-db:
$(MAKE) $(DB) $(MAKE) $(DB)
@ -44,7 +44,7 @@ $(ATERM).tar.gz:
false false
$(ATERM): $(ATERM).tar.gz $(ATERM): $(ATERM).tar.gz
gunzip < $(ATERM).tar.gz | tar xvf - gunzip < $(srcdir)/$(ATERM).tar.gz | tar xvf -
have-aterm: have-aterm:
$(MAKE) $(ATERM) $(MAKE) $(ATERM)
@ -76,7 +76,7 @@ $(BZIP2).tar.gz:
false false
$(BZIP2): $(BZIP2).tar.gz $(BZIP2): $(BZIP2).tar.gz
gunzip < $(BZIP2).tar.gz | tar xvf - gunzip < $(srcdir)/$(BZIP2).tar.gz | tar xvf -
have-bzip2: have-bzip2:
$(MAKE) $(BZIP2) $(MAKE) $(BZIP2)

2
misc/emacs/Makefile.am
View file

@ -2,4 +2,4 @@ EXTRA_DIST = nix-mode.el
install-data-local: install-data-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/emacs/site-lisp $(INSTALL) -d $(DESTDIR)$(datadir)/emacs/site-lisp
$(INSTALL_DATA) nix-mode.el $(DESTDIR)$(datadir)/emacs/site-lisp $(INSTALL_DATA) $(srcdir)/nix-mode.el $(DESTDIR)$(datadir)/emacs/site-lisp

2
src/boost/format/Makefile.am
View file

@ -5,4 +5,4 @@ libformat_la_SOURCES = format_implementation.cc free_funcs.cc \
format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \ format_fwd.hpp group.hpp internals.hpp internals_fwd.hpp \
macros_default.hpp macros_default.hpp
AM_CXXFLAGS = -Wall -I../.. AM_CXXFLAGS = -Wall -I$(srcdir)/../..

17
src/libexpr/Makefile.am
View file

@ -3,34 +3,33 @@ lib_LTLIBRARIES = libexpr.la
libexpr_la_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \ libexpr_la_SOURCES = nixexpr.cc nixexpr.hh parser.cc parser.hh \
eval.cc eval.hh primops.cc \ eval.cc eval.hh primops.cc \
lexer-tab.c lexer-tab.h parser-tab.c parser-tab.h \ lexer-tab.c lexer-tab.h parser-tab.c parser-tab.h \
nixexpr-ast.hh \
get-drvs.cc get-drvs.hh get-drvs.cc get-drvs.hh
BUILT_SOURCES = nixexpr-ast.cc nixexpr-ast.hh \
parser-tab.h lexer-tab.h parser-tab.c lexer-tab.c
EXTRA_DIST = lexer.l parser.y nixexpr-ast.def nixexpr-ast.cc EXTRA_DIST = lexer.l parser.y nixexpr-ast.def nixexpr-ast.cc
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore -I$(srcdir)/.. ${bdb_include} ${aterm_include} \
-I$(srcdir)/../libutil -I$(srcdir)/../libstore
AM_CFLAGS = \ AM_CFLAGS = \
${aterm_include} ${aterm_include}
# Parser generation. # Parser generation.
parser.cc: parser-tab.h lexer-tab.h
parser-tab.c parser-tab.h: parser.y parser-tab.c parser-tab.h: parser.y
$(bison) -v -o parser-tab.c parser.y -d $(bison) -v -o parser-tab.c $(srcdir)/parser.y -d
lexer-tab.c lexer-tab.h: lexer.l lexer-tab.c lexer-tab.h: lexer.l
$(flex) --outfile lexer-tab.c --header-file=lexer-tab.h lexer.l $(flex) --outfile lexer-tab.c --header-file=lexer-tab.h $(srcdir)/lexer.l
# ATerm helper function generation. # ATerm helper function generation.
nixexpr-ast.cc nixexpr-ast.hh: ../aterm-helper.pl nixexpr-ast.def nixexpr-ast.cc nixexpr-ast.hh: ../aterm-helper.pl nixexpr-ast.def
$(perl) ../aterm-helper.pl nixexpr-ast.hh nixexpr-ast.cc < nixexpr-ast.def $(perl) $(srcdir)/../aterm-helper.pl nixexpr-ast.hh nixexpr-ast.cc < $(srcdir)/nixexpr-ast.def
nixexpr.cc nixexpr.hh: nixexpr-ast.hh
CLEANFILES = CLEANFILES =

3
src/libmain/Makefile.am
View file

@ -9,4 +9,5 @@ AM_CXXFLAGS = \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \ -DNIX_CONF_DIR=\"$(sysconfdir)/nix\" \
-DNIX_VERSION=\"$(VERSION)\" \ -DNIX_VERSION=\"$(VERSION)\" \
-I.. ${aterm_include} -I../libutil -I../libstore -I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \
-I$(srcdir)/../libstore

10
src/libstore/Makefile.am
View file

@ -6,14 +6,14 @@ libstore_la_SOURCES = \
misc.cc misc.hh \ misc.cc misc.hh \
globals.cc globals.hh db.cc db.hh \ globals.cc globals.hh db.cc db.hh \
references.cc references.hh pathlocks.cc pathlocks.hh \ references.cc references.hh pathlocks.cc pathlocks.hh \
gc.cc gc.hh derivations-ast.hh gc.cc gc.hh
BUILT_SOURCES = derivations-ast.cc derivations-ast.hh
EXTRA_DIST = derivations-ast.def derivations-ast.cc EXTRA_DIST = derivations-ast.def derivations-ast.cc
AM_CXXFLAGS = -Wall \ AM_CXXFLAGS = -Wall \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I$(srcdir)/.. ${bdb_include} ${aterm_include} -I$(srcdir)/../libutil
derivations-ast.cc derivations-ast.hh: ../aterm-helper.pl derivations-ast.def derivations-ast.cc derivations-ast.hh: ../aterm-helper.pl derivations-ast.def
$(perl) ../aterm-helper.pl derivations-ast.hh derivations-ast.cc < derivations-ast.def $(perl) $(srcdir)/../aterm-helper.pl derivations-ast.hh derivations-ast.cc < $(srcdir)/derivations-ast.def
derivations.cc store.cc: derivations-ast.hh

2
src/libutil/Makefile.am
View file

@ -9,4 +9,4 @@ libutil_la_SOURCES += \
md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h md5.c md5.h sha1.c sha1.h sha256.c sha256.h md32_common.h
endif endif
AM_CXXFLAGS = -Wall -I.. ${aterm_include} AM_CXXFLAGS = -Wall -I$(srcdir)/.. ${aterm_include}

5
src/nix-env/Makefile.am
View file

@ -12,5 +12,6 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \ -I$(srcdir)/.. ${bdb_include} ${aterm_include} \
-I../libexpr -I../libmain -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
-I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr

2
src/nix-hash/Makefile.am
View file

@ -10,4 +10,4 @@ nix-hash.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. -I../../externals/inst/include -I../libutil -I../libstore -I../libmain -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore -I$(srcdir)/../libmain

5
src/nix-instantiate/Makefile.am
View file

@ -11,5 +11,6 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. ${bdb_include} ${aterm_include} -I../libutil -I../libstore \ ${bdb_include} ${aterm_include} \
-I../libexpr -I../libmain -I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
-I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr

2
src/nix-log2xml/Makefile.am
View file

@ -8,7 +8,7 @@ nix_log2xml_SOURCES = log2xml.cc
%.html: %.xml mark-errors.xsl log2html.xsl %.html: %.xml mark-errors.xsl log2html.xsl
$(xsltproc) mark-errors.xsl $< | $(xsltproc) log2html.xsl - > $@ $(xsltproc) mark-errors.xsl $< | $(xsltproc) log2html.xsl - > $@
LOG2HTML = mark-errors.xsl log2html.xsl treebits.js LOG2HTML = $(srcdir)/mark-errors.xsl $(srcdir)/log2html.xsl $(srcdir)/treebits.js
EXTRA_DIST = $(LOG2HTML) EXTRA_DIST = $(LOG2HTML)

3
src/nix-store/Makefile.am
View file

@ -10,4 +10,5 @@ main.o: help.txt.hh
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1) ../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \ AM_CXXFLAGS = \
-I.. ${bdb_include} $(aterm_include) -I../libutil -I../libstore -I../libmain -I$(srcdir)/.. ${bdb_include} $(aterm_include) -I$(srcdir)/../libutil \
-I$(srcdir)/../libstore -I$(srcdir)/../libmain