* Incorporated Berkeley DB and ATerm into the source tree.

* `make dist'.
This commit is contained in:
Eelco Dolstra 2003-07-23 15:53:34 +00:00
parent 9202570f8c
commit 39ce70025b
7 changed files with 63 additions and 5 deletions

View file

@ -1 +1,3 @@
SUBDIRS = src scripts corepkgs SUBDIRS = externals src scripts corepkgs
EXTRA_DIST = boost/*.hpp boost/format/*.hpp substitute.mk

View file

@ -1,4 +1,4 @@
AC_INIT(nix, 0.1) AC_INIT(nix, 0.2pre1)
AC_CONFIG_SRCDIR(src/nix.cc) AC_CONFIG_SRCDIR(src/nix.cc)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@ -12,7 +12,7 @@ AC_PROG_CXX
AC_PROG_RANLIB AC_PROG_RANLIB
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile AC_CONFIG_FILES([Makefile externals/Makefile src/Makefile scripts/Makefile
corepkgs/Makefile corepkgs/fetchurl/Makefile corepkgs/Makefile corepkgs/fetchurl/Makefile
corepkgs/nar/Makefile]) corepkgs/nar/Makefile])
AC_OUTPUT AC_OUTPUT

View file

@ -6,3 +6,5 @@ install-exec-local:
$(INSTALL_DATA) fetchurl.sh $(datadir)/fix/fetchurl $(INSTALL_DATA) fetchurl.sh $(datadir)/fix/fetchurl
include ../../substitute.mk include ../../substitute.mk
EXTRA_DIST = fetchurl.fix fetchurl.sh

View file

@ -8,3 +8,5 @@ install-exec-local:
$(INSTALL_DATA) unnar.sh $(datadir)/fix/nar $(INSTALL_DATA) unnar.sh $(datadir)/fix/nar
include ../../substitute.mk include ../../substitute.mk
EXTRA_DIST = nar.fix nar.sh unnar.fix unnar.sh

43
externals/Makefile.am vendored Normal file
View file

@ -0,0 +1,43 @@
# Berkeley DB
DB = db-4.0.14
DB_URL = http://www.sleepycat.com/update/snapshot/db-4.0.14.tar.gz
$(DB).tar.gz:
wget $(DB_URL)
$(DB): $(DB).tar.gz
gunzip < $(DB).tar.gz | tar xvf -
build-db: $(DB)
(pfx=`pwd` && \
cd $(DB)/build_unix && \
CC=$(CC) CXX=$(CXX) ../dist/configure --prefix=$$pfx/inst --enable-cxx --disable-shared && \
make && \
make install)
touch build-db
# CWI ATerm
ATERM = aterm-2.0
ATERM_URL = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.0.tar.gz
$(ATERM).tar.gz:
wget $(ATERM_URL)
$(ATERM): $(ATERM).tar.gz
gunzip < $(ATERM).tar.gz | tar xvf -
build-aterm: $(ATERM)
(pfx=`pwd` && \
cd $(ATERM) && \
./configure --prefix=$$pfx/inst && \
make && \
make install)
touch build-aterm
all: build-db build-aterm
EXTRA_DIST = $(DB).tar.gz $(ATERM).tar.gz

View file

@ -11,3 +11,8 @@ install-exec-local:
$(INSTALL_DATA) prebuilts.conf $(sysconfdir)/nix/prebuilts.conf $(INSTALL_DATA) prebuilts.conf $(sysconfdir)/nix/prebuilts.conf
include ../substitute.mk include ../substitute.mk
EXTRA_DIST = nix-switch.in nix-collect-garbage.in \
nix-pull.in nix-push.in nix-profile.sh.in \
prebuilts.conf

View file

@ -1,7 +1,8 @@
bin_PROGRAMS = nix nix-hash fix bin_PROGRAMS = nix nix-hash fix
check_PROGRAMS = test check_PROGRAMS = test
AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. AM_CXXFLAGS = -DSYSTEM=\"@host@\" -Wall -I.. -I../externals/inst/include $(CXXFLAGS)
AM_LDFLAGS = -L../externals/inst/lib -ldb_cxx -lATerm $(LDFLAGS)
nix_SOURCES = nix.cc nix_SOURCES = nix.cc
nix_LDADD = libshared.a libnix.a -ldb_cxx -lATerm nix_LDADD = libshared.a libnix.a -ldb_cxx -lATerm
@ -29,7 +30,8 @@ libshared_a_CXXFLAGS = \
-DNIX_STORE_DIR=\"$(prefix)/store\" \ -DNIX_STORE_DIR=\"$(prefix)/store\" \
-DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
$(AM_CXXFLAGS)
install-data-local: install-data-local:
$(INSTALL) -d $(localstatedir)/nix $(INSTALL) -d $(localstatedir)/nix
@ -37,3 +39,5 @@ install-data-local:
$(INSTALL) -d $(localstatedir)/log/nix $(INSTALL) -d $(localstatedir)/log/nix
$(INSTALL) -d $(prefix)/store $(INSTALL) -d $(prefix)/store
$(bindir)/nix --init $(bindir)/nix --init
EXTRA_DIST = *.hh *.h