From 1692b3e82521e7d73a908f532eced90491e1eded Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 30 Aug 2010 15:51:23 +0200 Subject: Support for automake and VC++ builds --- makefile | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'makefile') diff --git a/makefile b/makefile index ea14d69..e760441 100644 --- a/makefile +++ b/makefile @@ -5,30 +5,32 @@ include $(dir $(lastword $(MAKEFILE_LIST)))build/bootstrap.make +dirs := odb/mysql + default := $(out_base)/ -test := $(out_base)/.test -install := $(out_base)/.install +dist := $(out_base)/.dist clean := $(out_base)/.clean -# Build. -# -$(default): $(out_base)/odb/mysql/ #$(out_base)/tests/ +$(default): $(addprefix $(out_base)/,$(addsuffix /,$(dirs))) -# Test. -# -$(test): $(out_base)/tests/.test +$(dist): export dirs := $(dirs) +$(dist): export docs := GPLv2 LICENSE README version +$(dist): data_dist := libodb-mysql-vc9.sln libodb-mysql-vc10.sln +$(dist): exec_dist := bootstrap +$(dist): export extra_dist := $(data_dist) $(exec_dist) +$(dist): export version = $(shell cat $(src_root)/version) -# Install. -# -$(install): $(out_base)/odb/mysql/.install - $(call install-data,$(src_base)/LICENSE,$(install_doc_dir)/libodb-mysql/LICENSE) - $(call install-data,$(src_base)/README,$(install_doc_dir)/libodb-mysql/README) +$(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(dirs))) + $(call dist-data,$(docs) $(data_dist) libodb-mysql.pc.in) + $(call dist-exec,$(exec_dist)) + $(call dist-dir,m4) + $(call meta-automake) + $(call meta-autoconf) -# Clean. -# -$(clean): $(out_base)/odb/mysql/.clean #$(out_base)/tests/.clean +$(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(dirs))) -$(call include,$(bld_root)/install.make) +$(call include,$(bld_root)/dist.make) +$(call include,$(bld_root)/meta/automake.make) +$(call include,$(bld_root)/meta/autoconf.make) -$(call import,$(src_base)/odb/mysql/makefile) -#$(call import,$(src_base)/tests/makefile) +$(foreach d,$(dirs),$(call import,$(src_base)/$d/makefile)) -- cgit v1.1