Update Makefiles
This commit is contained in:
Eelco Dolstra
parent
568b1b0a8a
commit
b4c684e0f9
15 changed files with 18 additions and 29 deletions
4
Makefile
4
Makefile
|
|
@ -14,8 +14,10 @@ SUBS = \
|
|||
perl/Makefile \
|
||||
scripts/Makefile \
|
||||
corepkgs/Makefile \
|
||||
tests/Makefile
|
||||
tests/Makefile \
|
||||
|
||||
GLOBAL_CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
|
||||
|
||||
include Makefile.config
|
||||
|
||||
include mk/lib.mk
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ ifeq ($(perlbindings), yes)
|
|||
|
||||
Store_DIR := $(d)/lib/Nix
|
||||
|
||||
Store_SOURCES = Store.cc
|
||||
Store_SOURCES := $(Store_DIR)/Store.cc
|
||||
|
||||
Store_LIBS = libstore
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
SUBDIRS = format
|
||||
|
||||
nobase_pkginclude_HEADERS = assert.hpp checked_delete.hpp format.hpp \
|
||||
shared_ptr.hpp weak_ptr.hpp throw_exception.hpp \
|
||||
enable_shared_from_this.hpp \
|
||||
detail/shared_count.hpp detail/workaround.hpp
|
||||
|
||||
pkgincludedir = ${includedir}/nix/boost
|
||||
|
|
@ -4,4 +4,4 @@ libformat_NAME = libnixformat
|
|||
|
||||
libformat_DIR := $(d)
|
||||
|
||||
libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc
|
||||
libformat_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
PROGRAMS += bsdiff bspatch
|
||||
|
||||
bsdiff_DIR := $(d)
|
||||
bsdiff_SOURCES = bsdiff.c
|
||||
bsdiff_SOURCES := $(d)/bsdiff.c
|
||||
bsdiff_LDFLAGS = -lbz2 $(bsddiff_compat_include)
|
||||
bsdiff_INSTALL_DIR = $(libexecdir)/nix
|
||||
|
||||
bspatch_DIR := $(d)
|
||||
bspatch_SOURCES = bspatch.c
|
||||
bspatch_SOURCES := $(d)/bspatch.c
|
||||
bspatch_LDFLAGS = -lbz2 $(bsddiff_compat_include)
|
||||
bspatch_INSTALL_DIR = $(libexecdir)/nix
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,7 @@ libexpr_NAME = libnixexpr
|
|||
|
||||
libexpr_DIR := $(d)
|
||||
|
||||
libexpr_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
|
||||
libexpr_SOURCES := $(wildcard $(d)/*.cc) $(d)/lexer-tab.cc $(d)/parser-tab.cc
|
||||
|
||||
libexpr_LIBS = libutil libstore libformat
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ libmain_NAME = libnixmain
|
|||
|
||||
libmain_DIR := $(d)
|
||||
|
||||
libmain_SOURCES = shared.cc stack.cc
|
||||
libmain_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
||||
libmain_LIBS = libstore libutil libformat
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,7 @@ libstore_NAME = libnixstore
|
|||
|
||||
libstore_DIR := $(d)
|
||||
|
||||
libstore_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
|
||||
libstore_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
||||
libstore_LIBS = libutil libformat
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ libutil_NAME = libnixutil
|
|||
|
||||
libutil_DIR := $(d)
|
||||
|
||||
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc
|
||||
libutil_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
||||
ifeq ($(HAVE_OPENSSL), 1)
|
||||
libutil_LDFLAGS = $(OPENSSL_LIBS)
|
||||
else
|
||||
libutil_SOURCES += md5.c sha1.c sha256.c
|
||||
libutil_SOURCES += $(d)/md5.c $(d)/sha1.c $(d)/sha256.c
|
||||
endif
|
||||
|
||||
libutil_LIBS = libformat
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ PROGRAMS += nix-daemon
|
|||
|
||||
nix-daemon_DIR := $(d)
|
||||
|
||||
nix-daemon_SOURCES = nix-daemon.cc
|
||||
nix-daemon_SOURCES := $(d)/nix-daemon.cc
|
||||
|
||||
nix-daemon_LIBS = libmain libstore libutil libformat
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ PROGRAMS += nix-env
|
|||
|
||||
nix-env_DIR := $(d)
|
||||
|
||||
nix-env_SOURCES = nix-env.cc profiles.cc user-env.cc
|
||||
nix-env_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
||||
nix-env_LIBS = libexpr libmain libstore libutil libformat
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ PROGRAMS += nix-hash
|
|||
|
||||
nix-hash_DIR := $(d)
|
||||
|
||||
nix-hash_SOURCES = nix-hash.cc
|
||||
nix-hash_SOURCES := $(d)/nix-hash.cc
|
||||
|
||||
nix-hash_LIBS = libmain libstore libutil libformat
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@ PROGRAMS += nix-instantiate
|
|||
|
||||
nix-instantiate_DIR := $(d)
|
||||
|
||||
nix-instantiate_SOURCES = nix-instantiate.cc
|
||||
nix-instantiate_SOURCES := $(d)/nix-instantiate.cc
|
||||
|
||||
nix-instantiate_LIBS = libexpr libmain libstore libutil libformat
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ PROGRAMS += nix-log2xml
|
|||
|
||||
nix-log2xml_DIR := $(d)
|
||||
|
||||
nix-log2xml_SOURCES = log2xml.cc
|
||||
nix-log2xml_SOURCES := $(d)/log2xml.cc
|
||||
|
||||
$(foreach file, mark-errors.xsl log2html.xsl treebits.js, \
|
||||
$(eval $(call install-data-in, $(d)/$(file), $(datadir)/nix/log2html)))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ PROGRAMS += nix-store
|
|||
|
||||
nix-store_DIR := $(d)
|
||||
|
||||
nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc
|
||||
nix-store_SOURCES := $(wildcard $(d)/*.cc)
|
||||
|
||||
nix-store_LIBS = libmain libstore libutil libformat
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue