Skip to content

Commit

Permalink
Autotools: Reuse system libtool installation
Browse files Browse the repository at this point in the history
  • Loading branch information
lanodan authored and rzr committed Jan 24, 2024
1 parent 4c48dcd commit 0d64be5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile.am
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = gnu

SUBDIRS = libltdl addon base data src test
SUBDIRS = addon base data src test

EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop

Expand Down
10 changes: 1 addition & 9 deletions configure.ac
Expand Up @@ -9,7 +9,6 @@ AC_INIT([pinball],

AC_CONFIG_MACRO_DIRS([libltdl/m4])
AM_CONFIG_HEADER(pinconfig.h)
LT_CONFIG_LTDL_DIR([libltdl])

AC_CANONICAL_HOST
AC_CANONICAL_TARGET
Expand All @@ -33,15 +32,8 @@ AC_PROG_CC
AM_PROG_AR
AC_PROG_CXX
AC_PROG_INSTALL
_LT_SET_OPTION([LT_INIT],[dlopen])
AC_DIAGNOSE([obsolete],[AC_LIBTOOL_DLOPEN: Remove this warning and the call to _LT_SET_OPTION when you
put the 'dlopen' option into LT_INIT's first parameter.])

LT_INIT
LTDL_INIT

AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
LT_INIT([dlopen])

dnl *******************************************
dnl PATHS AND DIRS ****************************
Expand Down
4 changes: 2 additions & 2 deletions helper.mk
Expand Up @@ -166,7 +166,7 @@ config.status configure: acinclude.m4 pinconfig.h.in Makefile.in

INSTALL config.guess config.sub depcomp install-sh autom4te.cache: Makefile.am ltmain.sh pinconfig.h.in README
@echo "# log: $@: $^"
automake --add-missing --copy --force
automake --add-missing --copy
stat -c '%y: %n' $^ $@

README: README.md
Expand Down Expand Up @@ -198,7 +198,7 @@ pinconfig.h.in: aclocal.m4

libltdl/m4 compile missing ltmain.sh: configure.ac
@echo "# log: $@: $<"
libtoolize --ltdl --force --copy
libtoolize --force
stat -c '%y: %n' $^ $@

devel: ${app}
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
Expand Up @@ -7,9 +7,9 @@ bin_PROGRAMS = pinball

pinlib_LIBRARIES = libemilia_pin.a

AM_CPPFLAGS = -I../base -I../addon @INCLTDL@
AM_CPPFLAGS = -I../base -I../addon

pinball_LDADD = libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
pinball_LDADD = libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
pinball_LDFLAGS = -export-dynamic

pinball_SOURCES = Pinball.cpp
Expand Down
4 changes: 2 additions & 2 deletions test/Makefile.am
Expand Up @@ -6,8 +6,8 @@ testdatadir = $(pkgdatadir)
noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
# noinst_PROGRAMS = unittest

AM_CPPFLAGS = -I../base -I../addon -I../src @INCLTDL@
LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
AM_CPPFLAGS = -I../base -I../addon -I../src
LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl

testlib_LTLIBRARIES = libModuleTest.la

Expand Down

0 comments on commit 0d64be5

Please sign in to comment.