New non-recursive, plain Make-based build system

This commit is contained in:
Eelco Dolstra 2013-11-22 15:54:18 +01:00
parent 709cbe4e76
commit b8e9efc476
15 changed files with 183 additions and 0 deletions

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
Makefile Makefile
Makefile.in Makefile.in
Makefile.config
# / # /
/aclocal.m4 /aclocal.m4

10
Makefile.config.in Normal file
View file

@ -0,0 +1,10 @@
VERSION = @VERSION@
bindir = @bindir@
datadir = @datadir@
datarootdir = @datarootdir@
exec_prefix = @exec_prefix@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
prefix = @prefix@
storedir = @storedir@
sysconfdir = @sysconfdir@

63
Makefile.lib Normal file
View file

@ -0,0 +1,63 @@
default: all
here = $(dir $(lastword $(MAKEFILE_LIST)))
LIBS =
QUIET = @
%.o: %.cc
$(QUIET) g++ -o $@ -c $^ -g -fPIC $(CXXFLAGS) $($@_CXXFLAGS)
%.o: %.c
$(QUIET) gcc -o $@ -c $^ -g -fPIC $(CFLAGS) $($@_CFLAGS)
# Generate Make rules for libraries.
libs_list :=
define LIBS_template =
_d := $$($(1)_DIR)
_objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o)
_libs := $$(foreach lib, $$($(1)_LIBS), $$(lib).a)
_lib := $$(_d)$(1).a
$$(_lib): $$(_objs)
$(QUIET) ar crs $$@ $$?
# Propagate CXXFLAGS to the individual object files.
$$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
clean_list += $$(_lib) $$(_objs)
libs_list += $$(_lib)
endef
# Generate Make rules for programs.
programs_list :=
define PROGRAMS_template =
_d := $$($(1)_DIR)
_objs := $$(foreach src, $$($(1)_SOURCES), $$(_d)$$(basename $$(src)).o)
_libs := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_DIR)$$(lib).a)
_prog := $$(_d)$(1)
$$(_prog): $$(_objs) $$(_libs)
$(QUIET) g++ -o $$@ $$^ $$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS))
# Propagate CXXFLAGS to the individual object files.
$$(foreach obj, $$(_objs), $$(eval $$(obj)_CXXFLAGS=$$($(1)_CXXFLAGS)))
clean_list += $$(_prog) $$(_objs)
programs_list += $$(_prog)
endef
# Cleaning stuff.
clean_list :=
clean:
rm -fv $(clean_list)
dryclean:
@echo $(clean_list)

22
Makefile.new Normal file
View file

@ -0,0 +1,22 @@
include Makefile.config
include Makefile.lib
include src/boost/format/Makefile.new
include src/libutil/Makefile.new
include src/libstore/Makefile.new
include src/libmain/Makefile.new
include src/libexpr/Makefile.new
include src/nix-hash/Makefile.new
include src/nix-store/Makefile.new
include src/nix-instantiate/Makefile.new
include src/nix-env/Makefile.new
include src/nix-daemon/Makefile.new
CXXFLAGS = -I . -I src -I src/libutil -I src/libstore -I src/libmain -I src/libexpr
CFLAGS =
$(foreach lib, $(LIBS), $(eval $(call LIBS_template,$(lib))))
$(foreach prog, $(PROGRAMS), $(eval $(call PROGRAMS_template,$(prog))))
all: $(programs_list)

View file

@ -385,5 +385,6 @@ AC_CONFIG_FILES([Makefile
misc/Makefile misc/Makefile
misc/emacs/Makefile misc/emacs/Makefile
tests/Makefile tests/Makefile
Makefile.config
]) ])
AC_OUTPUT AC_OUTPUT

View file

@ -0,0 +1,5 @@
LIBS += libformat
libformat_DIR := $(here)
libformat_SOURCES = format_implementation.cc free_funcs.cc parsing.cc

10
src/libexpr/Makefile.new Normal file
View file

@ -0,0 +1,10 @@
LIBS += libexpr
libexpr_DIR := $(here)
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
# FIXME: add rules for parser-tab.cc / lexer-tab.cc.

7
src/libmain/Makefile.new Normal file
View file

@ -0,0 +1,7 @@
LIBS += libmain
libmain_DIR := $(here)
libmain_SOURCES = shared.cc stack.cc
libmain_LDFLAGS = -lgc

19
src/libstore/Makefile.new Normal file
View file

@ -0,0 +1,19 @@
LIBS += libstore
libstore_DIR := $(here)
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_LDFLAGS = -lsqlite3 -lbz2
libstore_CXXFLAGS = \
-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)\"

10
src/libutil/Makefile.new Normal file
View file

@ -0,0 +1,10 @@
LIBS += libutil
libutil_DIR := $(here)
libutil_SOURCES = util.cc hash.cc serialise.cc archive.cc xml-writer.cc affinity.cc \
md5.c sha1.c sha256.c
# FIXME: md5.c et al. should only be built when we don't have OpenSSL.
libutil_LIBS = src/boost/format/libformat

View file

@ -0,0 +1,7 @@
PROGRAMS += nix-daemon
nix-daemon_DIR := $(here)
nix-daemon_SOURCES = nix-daemon.cc
nix-daemon_LIBS = libmain libstore libutil libformat

7
src/nix-env/Makefile.new Normal file
View file

@ -0,0 +1,7 @@
PROGRAMS += nix-env
nix-env_DIR := $(here)
nix-env_SOURCES = nix-env.cc profiles.cc profiles.hh user-env.cc user-env.hh
nix-env_LIBS = libexpr libmain libstore libutil libformat

View file

@ -0,0 +1,7 @@
PROGRAMS += nix-hash
nix-hash_DIR := $(here)
nix-hash_SOURCES = nix-hash.cc
nix-hash_LIBS = libmain libstore libutil libformat

View file

@ -0,0 +1,7 @@
PROGRAMS += nix-instantiate
nix-instantiate_DIR := $(here)
nix-instantiate_SOURCES = nix-instantiate.cc
nix-instantiate_LIBS = libexpr libmain libstore libutil libformat

View file

@ -0,0 +1,7 @@
PROGRAMS += nix-store
nix-store_DIR := $(here)
nix-store_SOURCES = nix-store.cc dotgraph.cc xmlgraph.cc
nix-store_LIBS = libmain libstore libutil libformat