From 7de9585efbbd148df26cd180900db69e11c36061 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 17 May 2017 19:30:24 +0100 Subject: Set up an autotools system. Supersedes the hand-hacked Makefile I was previously working with. --- .gitignore | 28 ++++++++++++++++++++++++++++ Makefile.am | 18 ++++++++++++++++++ Makefile.wixfakelibs | 21 --------------------- autogen.sh | 2 ++ configure.ac | 17 +++++++++++++++++ 5 files changed, 65 insertions(+), 21 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile.am delete mode 100644 Makefile.wixfakelibs create mode 100755 autogen.sh create mode 100644 configure.ac diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df4b72b --- /dev/null +++ b/.gitignore @@ -0,0 +1,28 @@ +/arc +/.deps/ +/.libs/ +*.lo +*.la +*.o +*.a +*.so +*.so.* +/Makefile +/Makefile.in +/aclocal.m4 +/autom4te.cache/ +/compile +/config.h +/config.h.in +/config.log +/config.status +/config.guess +/config.sub +/configure +/depcomp +/install-sh +/missing +/stamp-h1 +/libtool +/ltmain.sh +/m4 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..56da99e --- /dev/null +++ b/Makefile.am @@ -0,0 +1,18 @@ +libdir = $(bindir) + +ACLOCAL_AMFLAGS = -I m4 + +lib_LTLIBRARIES = libwinterop.so.la libmsi.so.la libpreload.la + +libwinterop_so_la_SOURCES = fake-winterop.c fake-lib.c fake-lib.h + +libmsi_so_la_SOURCES = fake-msi.c fake-lib.c fake-lib.h + +libpreload_la_SOURCES = preload.c +libpreload_la_LDFLAGS = -ldl + +bin_SCRIPTS = wrapper.py makecab.py + +install-exec-hook: + cd $(DESTDIR)$(bindir) && $(LN_S) wrapper.py candle + cd $(DESTDIR)$(bindir) && $(LN_S) wrapper.py light diff --git a/Makefile.wixfakelibs b/Makefile.wixfakelibs deleted file mode 100644 index 6cce710..0000000 --- a/Makefile.wixfakelibs +++ /dev/null @@ -1,21 +0,0 @@ -# -*- makefile -*- - -.SUFFIXES: .c .lo .la - -all: libwinterop.so.la libmsi.so.la libpreload.la - -%.la: - libtool --mode=link gcc -o $@ $^ -rpath /usr/local/lib - -%.lo: %.c - libtool --mode=compile gcc -c $^ - -libwinterop.so.la: fake-winterop.lo fake-lib.lo - -libmsi.so.la: fake-msi.lo fake-lib.lo - -libpreload.la: preload.lo - -clean: - rm -rf .libs - rm -f *.o *.lo *.la diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..52251d0 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,2 @@ +#!/bin/sh +autoreconf -i && rm -rf autom4te.cache diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..a5986be --- /dev/null +++ b/configure.ac @@ -0,0 +1,17 @@ +# autoconf input for Wix Linux shim. + +AC_INIT([wix-linux-shim], [NOVERSION], [anakin@pobox.com]) +AC_CONFIG_SRCDIR([fake-lib.h]) +AC_CONFIG_MACRO_DIRS([m4]) + +AM_INIT_AUTOMAKE(foreign) + +AC_PROG_CC +AC_PROG_LIBTOOL +AC_PROG_INSTALL +AC_PROG_LN_S + +AC_LANG([C]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT -- cgit v1.2.3-55-g6feb