From 436a07ee06c77e0460683ddb811fabf400a65967 Mon Sep 17 00:00:00 2001 From: Joachim Nilsson Date: Sun, 5 Jul 2015 11:06:33 +0200 Subject: [PATCH] Remove STATIC ifdef, always build .a and .so files Using libite as a GIT submodule in a autoconf/automake based project it is non-trivial to set a separate environment variable when descending into the libite subdirectory. It is better to instead simplify the build process and always build both .a and .so files. Signed-off-by: Joachim Nilsson --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 4f75c40..56668f2 100644 --- a/Makefile +++ b/Makefile @@ -55,11 +55,7 @@ LIBNAME = $(NAME) SOLIB = $(LIBNAME).so.$(VER) SYMLIB = $(LIBNAME).so STATICLIB = $(LIBNAME).a -ifdef STATIC -TARGET = $(STATICLIB) -else -TARGET = $(SOLIB) -endif +TARGET = $(STATICLIB) $(SOLIB) # Default install paths prefix ?= /usr/local @@ -85,12 +81,10 @@ $(STATICLIB): Makefile $(OBJS) @$(AR) $(ARFLAGS) $@ $(OBJS) install-exec: all -ifndef STATIC @printf " INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n" @install -d $(DESTDIR)$(libdir) @$(STRIPINST) $(SOLIB) $(DESTDIR)$(libdir)/$(SOLIB) @ln -sf $(SOLIB) $(DESTDIR)$(libdir)/$(SYMLIB) -endif install-dev: @install -d $(DESTDIR)$(incdir)/$(LIBNAME) @@ -98,11 +92,9 @@ install-dev: printf " INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n"; \ $(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file; \ done -ifdef STATIC @printf " INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n" @install -d $(DESTDIR)$(libdir) @$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB) -endif @install -d $(DESTDIR)$(datadir) @for file in $(DISTFILES); do \ printf " INSTALL $(DESTDIR)$(datadir)/$$file\n"; \