diff --git a/make_templates/header_only_lib b/make_templates/header_only_lib index cebc88c2d77501409ed7fcc0f94c23d8aeb6d97c..2bbaa9ff221714096055cb68b94a4502a11db870 100644 --- a/make_templates/header_only_lib +++ b/make_templates/header_only_lib @@ -1,5 +1,10 @@ TAREGT_INCLUDE := include -COPYRIGHT := COPYRIGHT + +ifneq ($(shell cat COPYRIGHT 2> /dev/null),) +COPYRIGHT ?= COPYRIGHT +else +COPYRIGHT ?= /dev/null +endif PREFIX := $(DESTDIR)/usr/local INCDIR := $(PREFIX)/$(TAREGT_INCLUDE) diff --git a/make_templates/static_lib b/make_templates/static_lib index 98367316580482bf768c9fb15c34af0ea350d2e5..5e778da3ecea23ff0e7f2bbe902808e89ffe3f67 100644 --- a/make_templates/static_lib +++ b/make_templates/static_lib @@ -8,10 +8,14 @@ ARFLAGS := $(ARFLAGS)c TAREGT_INCLUDE := include TAREGT_SOURCE := source TAREGT_LIB := lib -LOCAL_TEMP := . -LOCAL_DIST := . +#LOCAL_TEMP +#LOCAL_DIST -COPYRIGHT := COPYRIGHT +ifneq ($(shell cat COPYRIGHT 2> /dev/null),) +COPYRIGHT ?= COPYRIGHT +else +COPYRIGHT ?= /dev/null +endif PREFIX := $(DESTDIR)/usr/local INCDIR := $(PREFIX)/$(TAREGT_INCLUDE) @@ -19,11 +23,21 @@ LIBDIR := $(PREFIX)/$(TAREGT_LIB) TARGET_SRCDIR := $(PREFIX)/$(TAREGT_SOURCE) SRCDIR := ./source -TEMPDIR := temp/$(LOCAL_TEMP) + +TEMPDIR := temp +ifneq ($(LOCAL_TEMP),) +TEMPDIR := $(TEMPDIR)/$(LOCAL_TEMP) +endif + DISTDIR := out/$(LOCAL_DIST) +ifneq ($(LOCAL_DIST),) +DISTDIR := $(DISTDIR)/$(LOCAL_DIST) +endif + ifeq ($(origin TARGET), undefined) TARGET := $(shell pwd | xargs basename).a endif + OUT := $(DISTDIR)/$(TARGET) HEADERS := $(shell find -wholename "$(SRCDIR)/*.hpp" && find -wholename "$(SRCDIR)/*.h") @@ -56,7 +70,8 @@ $(DISTDIR): clean: @rm $(DEPENDS) 2> /dev/null || true @rm $(OBJECTS) 2> /dev/null || true - @rmdir -p -p $(OBJDIRS) 2> /dev/null || true + @rmdir -p $(OBJDIRS) 2> /dev/null || true + @rmdir -p $(TEMPDIR) 2> /dev/null || true @echo Temporaries cleaned! distclean: clean