wt/libite
1
0 Fork 0
mirror of https://github.com/troglobit/libite.git synced 2026-10-27 12:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove STATIC ifdef, always build .a and .so files

Browse Source 
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:
Joachim Nilsson committed 2015-07-05 11:06:33 +02:00
1 parent e37aad9530
commit 436a07ee06
1 file changed
+1 -9
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -9
View File
@@ -55,11 +55,7 @@ LIBNAME = $(NAME)
SOLIB = $(LIBNAME).so.$(VER) SOLIB = $(LIBNAME).so.$(VER)
SYMLIB = $(LIBNAME).so SYMLIB = $(LIBNAME).so
STATICLIB = $(LIBNAME).a STATICLIB = $(LIBNAME).a
ifdef STATIC TARGET = $(STATICLIB) $(SOLIB)
TARGET = $(STATICLIB)
else
TARGET = $(SOLIB)
endif
# Default install paths # Default install paths
prefix ?= /usr/local prefix ?= /usr/local
@@ -85,12 +81,10 @@ $(STATICLIB): Makefile $(OBJS)
@$(AR) $(ARFLAGS) $@ $(OBJS) @$(AR) $(ARFLAGS) $@ $(OBJS)
install-exec: all install-exec: all
ifndef STATIC
@printf " INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n" @printf " INSTALL $(DESTDIR)$(libdir)/$(SOLIB)\n"
@install -d $(DESTDIR)$(libdir) @install -d $(DESTDIR)$(libdir)
@$(STRIPINST) $(SOLIB) $(DESTDIR)$(libdir)/$(SOLIB) @$(STRIPINST) $(SOLIB) $(DESTDIR)$(libdir)/$(SOLIB)
@ln -sf $(SOLIB) $(DESTDIR)$(libdir)/$(SYMLIB) @ln -sf $(SOLIB) $(DESTDIR)$(libdir)/$(SYMLIB)
endif
install-dev: install-dev:
@install -d $(DESTDIR)$(incdir)/$(LIBNAME) @install -d $(DESTDIR)$(incdir)/$(LIBNAME)
@@ -98,11 +92,9 @@ install-dev:
printf " INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n"; \ printf " INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n"; \
$(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file; \ $(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file; \
done done
ifdef STATIC
@printf " INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n" @printf " INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n"
@install -d $(DESTDIR)$(libdir) @install -d $(DESTDIR)$(libdir)
@$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB) @$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
endif
@install -d $(DESTDIR)$(datadir) @install -d $(DESTDIR)$(datadir)
@for file in $(DISTFILES); do \ @for file in $(DISTFILES); do \
printf " INSTALL $(DESTDIR)$(datadir)/$$file\n"; \ printf " INSTALL $(DESTDIR)$(datadir)/$$file\n"; \