diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-03-18T22·54+0100 |
| commit | b006a31d52b8f1cb01f3d722a6e3411dc8b98d64 (patch) | |
| tree | 4edaff4f557a20a12e8cc9be4414081d71f46dd9 /externals/Makefile.am | |
| parent | 2e0322efd14df7a1658201fb443c8e90687dcfda (diff) | |
Drop the externals directory
Nix now requires SQLite and bzip2 to be pre-installed. SQLite is detected using pkg-config. We required DBD::SQLite anyway, so depending on SQLite is not a big problem. The --with-bzip2, --with-openssl and --with-sqlite flags are gone.
Diffstat (limited to 'externals/Makefile.am')
| -rw-r--r-- | externals/Makefile.am | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/externals/Makefile.am b/externals/Makefile.am deleted file mode 100644 index 80c1548bbf2c..000000000000 --- a/externals/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -# bzip2 - -BZIP2 = bzip2-1.0.6 - -$(BZIP2).tar.gz: - @echo "Nix requires bzip2 to build." - @echo "Please download version 1.0.6 from" - @echo " http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz" - @echo "and place it in the externals/ directory." - false - -$(BZIP2): $(BZIP2).tar.gz - gunzip < $(srcdir)/$(BZIP2).tar.gz | tar xvf - - -if HAVE_BZIP2 -build-bzip2: -else -build-bzip2: $(BZIP2) - (cd $(BZIP2) && \ - $(MAKE) CC="$(CC)" && \ - $(MAKE) install PREFIX=$(abs_builddir)/inst-bzip2) - touch build-bzip2 - -install-exec-local:: build-bzip2 - mkdir -p $(DESTDIR)${bzip2_bin} - $(INSTALL_PROGRAM) $(bzip2_bin_test)/bzip2 $(DESTDIR)${bzip2_bin} -endif - - -# SQLite - -SQLITE = sqlite-autoconf-$(SQLITE_VERSION) -SQLITE_TAR = sqlite-autoconf-$(SQLITE_VERSION).tar.gz - -$(SQLITE_TAR): - @echo "Nix requires the SQLite library to build." - @echo "Please download version $(SQLITE_VERSION) from" - @echo " http://www.sqlite.org/$(SQLITE_TAR)" - @echo "and place it in the externals/ directory." - false - -$(SQLITE): $(SQLITE_TAR) - gzip -d < $(srcdir)/$(SQLITE_TAR) | tar xvf - - -if HAVE_SQLITE -build-sqlite: -else -build-sqlite: $(SQLITE) - (cd $(SQLITE) && \ - CC="$(CC)" CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1" ./configure --disable-static --prefix=$(pkglibdir)/dummy --libdir=${pkglibdir} $(SUB_CONFIGURE_FLAGS) && \ - $(MAKE) ) - touch build-sqlite - -install-exec-local:: build-sqlite - cd $(SQLITE) && $(MAKE) install - rm -rf "$(DESTDIR)/$(pkglibdir)/dummy" -endif - - -all: build-bzip2 build-sqlite - -EXTRA_DIST = $(BZIP2).tar.gz $(SQLITE_TAR) - -clean: - $(RM) -f build-bzip2 build-sqlite - $(RM) -rf $(BZIP2) $(SQLITE) - $(RM) -rf inst-bzip2 |