Skip to content

configure.ac: add support for static-only configuration #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KAction wants to merge 1 commit into
base: master
Choose a base branch
from
Open

configure.ac: add support for static-only configuration #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.include.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ MAKEINFO = @MAKEINFO@
TEXI2HTML = texi2html
STRIP = -s

AR = ar
AR = @AR@
ETAGS = etags
AWK = awk
CP = cp -a
Expand Down
18 changes: 17 additions & 1 deletion configure.ac.footer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@ AC_CHECK_HEADERS(sys/socket.h,,[AC_MSG_ERROR([Required header file missing])])

AC_ARG_ENABLE([static],
[ --enable-static build static libraries @<:@default=no@:>@])
AC_ARG_ENABLE([shared],
[ --enable-shared build shared libraries @<:@default=yes@:>@])


LIBGPM_A=

Expand Down Expand Up @@ -131,9 +134,22 @@ No|no|N|n) SHARED_LIBS=-lc ;;
done
SHARED_LIBS="$LIBS $TERMLIBS -lc"
LIBS=$SAVELIBS ;;
esac
esac

LIBGPM_SO=
LIBGPM_SO_LEV=
LIBGPM_SO_FULL=

AS_IF([test "x$enable_shared" = "xyes"], [
LIBGPM_SO=lib/libgpm.so
LIBGPM_SO_LEV=lib/libgpm.so.$abi_lev
LIBGPM_SO_FULL=lib/libgpm.so.$abi_full
])

GPMXTERM=
AC_SUBST(LIBGPM_SO)
AC_SUBST(LIBGPM_SO_LEV)
AC_SUBST(LIBGPM_SO_FULL)
AC_SUBST(GPMXTERM)
AC_SUBST(abi_lev)
AC_SUBST(abi_full)
Expand Down
20 changes: 16 additions & 4 deletions src/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ prog/%: prog/%.o
# | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'

# Do it all!
all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
all: gpm @LIBGPM_SO@ @LIBGPM_SO_LEV@ @LIBGPM_A@ $(PROG)

gpm: $(GOBJ)
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
Expand Down Expand Up @@ -149,14 +149,26 @@ prog/gpm-root.c: $(srcdir)/prog/gpm-root.y
$(YACC) $(YFLAGS) $< && mv y.tab.c prog/gpm-root.c

# gpm-root needs an own rule, because gpm-root.c is not in $(srcdir)
prog/gpm-root: prog/gpm-root.c lib/libgpm.so.@abi_lev@
ifneq (@LIBGPM_SO_LEV@,)
prog/gpm-root: prog/gpm-root.c @LIBGPM_SO_LEV@
$(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o [email protected] $<
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ [email protected] @LIBS@ $(LIBS) lib/libgpm.so.@abi_lev@
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ [email protected] @LIBS@ $(LIBS) @LIBGPM_SO_LEV@
else
prog/gpm-root: prog/gpm-root.c @LIBGPM_A@
$(CC) -I. @CPPFLAGS@ $(CPPFLAGS) @CFLAGS@ $(CFLAGS) -c -o [email protected] $<
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ [email protected] @LIBS@ $(LIBS) @LIBGPM_A@
endif

prog/mouse-test: prog/mouse-test.o mice.o twiddler.o synaptics.o prog/open_console.o
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $^ @LIBS@ $(LIBS) -lm

$(PROG): lib/libgpm.so.@abi_lev@
# If we build both static and shared libraries, favor shared to preserve
# old behaviour.
ifneq (@LIBGPM_SO_LEV@,)
$(PROG): @LIBGPM_SO_LEV@
else
$(PROG): @LIBGPM_A@
endif

# Subdirectory lib/
lib/libgpm.a: $(LOBJ)
Expand Down