diff options
| author | Simon Tatham <anakin@pobox.com> | 2017-05-17 19:30:24 +0100 |
|---|---|---|
| committer | Simon Tatham <anakin@pobox.com> | 2017-05-17 19:31:26 +0100 |
| commit | 7de9585efbbd148df26cd180900db69e11c36061 (patch) | |
| tree | 71633e9aeaa43a7a43a7078cedf16cda267bb0dc | |
| parent | e8d91ad3692c3e8941f86d5d2fe51eb572f20095 (diff) | |
| download | wix-on-linux-7de9585efbbd148df26cd180900db69e11c36061.tar.gz wix-on-linux-7de9585efbbd148df26cd180900db69e11c36061.tar.bz2 wix-on-linux-7de9585efbbd148df26cd180900db69e11c36061.zip | |
Set up an autotools system.
Supersedes the hand-hacked Makefile I was previously working with.
| -rw-r--r-- | .gitignore | 28 | ||||
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | Makefile.wixfakelibs | 21 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 17 |
5 files changed, 65 insertions, 21 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..df4b72b --- /dev/null +++ b/.gitignore | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | /arc | ||
| 2 | /.deps/ | ||
| 3 | /.libs/ | ||
| 4 | *.lo | ||
| 5 | *.la | ||
| 6 | *.o | ||
| 7 | *.a | ||
| 8 | *.so | ||
| 9 | *.so.* | ||
| 10 | /Makefile | ||
| 11 | /Makefile.in | ||
| 12 | /aclocal.m4 | ||
| 13 | /autom4te.cache/ | ||
| 14 | /compile | ||
| 15 | /config.h | ||
| 16 | /config.h.in | ||
| 17 | /config.log | ||
| 18 | /config.status | ||
| 19 | /config.guess | ||
| 20 | /config.sub | ||
| 21 | /configure | ||
| 22 | /depcomp | ||
| 23 | /install-sh | ||
| 24 | /missing | ||
| 25 | /stamp-h1 | ||
| 26 | /libtool | ||
| 27 | /ltmain.sh | ||
| 28 | /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 @@ | |||
| 1 | libdir = $(bindir) | ||
| 2 | |||
| 3 | ACLOCAL_AMFLAGS = -I m4 | ||
| 4 | |||
| 5 | lib_LTLIBRARIES = libwinterop.so.la libmsi.so.la libpreload.la | ||
| 6 | |||
| 7 | libwinterop_so_la_SOURCES = fake-winterop.c fake-lib.c fake-lib.h | ||
| 8 | |||
| 9 | libmsi_so_la_SOURCES = fake-msi.c fake-lib.c fake-lib.h | ||
| 10 | |||
| 11 | libpreload_la_SOURCES = preload.c | ||
| 12 | libpreload_la_LDFLAGS = -ldl | ||
| 13 | |||
| 14 | bin_SCRIPTS = wrapper.py makecab.py | ||
| 15 | |||
| 16 | install-exec-hook: | ||
| 17 | cd $(DESTDIR)$(bindir) && $(LN_S) wrapper.py candle | ||
| 18 | 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 @@ | |||
| 1 | # -*- makefile -*- | ||
| 2 | |||
| 3 | .SUFFIXES: .c .lo .la | ||
| 4 | |||
| 5 | all: libwinterop.so.la libmsi.so.la libpreload.la | ||
| 6 | |||
| 7 | %.la: | ||
| 8 | libtool --mode=link gcc -o $@ $^ -rpath /usr/local/lib | ||
| 9 | |||
| 10 | %.lo: %.c | ||
| 11 | libtool --mode=compile gcc -c $^ | ||
| 12 | |||
| 13 | libwinterop.so.la: fake-winterop.lo fake-lib.lo | ||
| 14 | |||
| 15 | libmsi.so.la: fake-msi.lo fake-lib.lo | ||
| 16 | |||
| 17 | libpreload.la: preload.lo | ||
| 18 | |||
| 19 | clean: | ||
| 20 | rm -rf .libs | ||
| 21 | 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 @@ | |||
| 1 | #!/bin/sh | ||
| 2 | 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 @@ | |||
| 1 | # autoconf input for Wix Linux shim. | ||
| 2 | |||
| 3 | AC_INIT([wix-linux-shim], [NOVERSION], [anakin@pobox.com]) | ||
| 4 | AC_CONFIG_SRCDIR([fake-lib.h]) | ||
| 5 | AC_CONFIG_MACRO_DIRS([m4]) | ||
| 6 | |||
| 7 | AM_INIT_AUTOMAKE(foreign) | ||
| 8 | |||
| 9 | AC_PROG_CC | ||
| 10 | AC_PROG_LIBTOOL | ||
| 11 | AC_PROG_INSTALL | ||
| 12 | AC_PROG_LN_S | ||
| 13 | |||
| 14 | AC_LANG([C]) | ||
| 15 | |||
| 16 | AC_CONFIG_FILES([Makefile]) | ||
| 17 | AC_OUTPUT | ||
