mirror of
https://github.com/troglobit/libite.git
synced 2026-10-16 10:39:30 +00:00
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 <troglobit@gmail.com>
This commit is contained in:
1 parent
e37aad9530
commit
436a07ee06
1 file changed
+1
-9
@@ -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"; \
|
||||
|
||||
Reference in new issue
Block a user