From d4f61136550911d7576f3d819680a5725b0dc2d9 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 15 Mar 2009 15:17:51 -0400 Subject: [PATCH] Switch to autotools for building. --- .gitignore | 19 +++++++++++++++++-- Makefile | 19 ------------------- Makefile.am | 12 ++++++++++++ autogen.sh | 13 +++++++++++++ configure.ac | 25 +++++++++++++++++++++++++ 5 files changed, 67 insertions(+), 21 deletions(-) delete mode 100644 Makefile create mode 100644 Makefile.am create mode 100755 autogen.sh create mode 100644 configure.ac diff --git a/.gitignore b/.gitignore index 9102e05..4f11579 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,18 @@ -main *.o -libaspectbin.so +*.lo +*.la +Makefile +Makefile.in +.libs +.deps +config.* +aclocal.m4 +autom4te.cache +m4 +configure +libtool +ltmain.sh +install-sh +depcomp +missing +stamp-h1 diff --git a/Makefile b/Makefile deleted file mode 100644 index 4708031..0000000 --- a/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -CC = gcc -g -std=c99 -pedantic -WARNINGS = -Wall - -GTK_CFLAGS = $(shell pkg-config --cflags gtk+-2.0) -GTK_LIBS = $(shell pkg-config --libs gtk+-2.0) -GLADEUI_CFLAGS = $(shell pkg-config --cflags gladeui-1.0) -GLADEUI_LIBS = $(shell pkg-config --libs gladeui-1.0) - -main: main.o libaspectbin.so - $(CC) -o $@ $(GTK_LIBS) $(LDFLAGS) $^ - -libaspectbin.so: aspectbin.o aspectbin-glade.o - $(CC) -fPIC -shared -o $@ $(GTK_LIBS) $(GLADEUI_LIBS) $(LDFLAGS) $^ - -.c.o: - $(CC) -fPIC -c -o $@ $(WARNINGS) $(GTK_CFLAGS) $(GLADEUI_CFLAGS) $(CFLAGS) $< - -aspectbin.o: aspectbin.h -main.o: aspectbin.h diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..5fdd371 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,12 @@ +ACLOCAL_AMFLAGS = -I m4 +lib_LTLIBRARIES = libaspectbin.la + +libaspectbin_la_SOURCES = aspectbin.c +libaspectbin_la_CFLAGS = $(GTK_CFLAGS) +libaspectbin_la_LDFLAGS = $(GTK_LIBS) + +if BUILD_GLADE +libaspectbin_la_SOURCES += aspectbin-glade.c +libaspectbin_la_CFLAGS += $(GLADEUI_CFLAGS) +libaspectbin_la_LDFLAGS += $(GLADEUI_LIBS) +endif diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 0000000..b52b9c1 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +die() +{ + echo $@ 1>&2 + exit 1 +} + +aclocal --force || die "Failed to run aclocal." +autoheader --force || die "Failed to run autoheader." +libtoolize --force --copy || die "Failed to run libtoolize." +automake --force --add-missing || die "Failed to run automake." +autoconf --force || die "Failed to run autoconf." diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..9eae19e --- /dev/null +++ b/configure.ac @@ -0,0 +1,25 @@ +AC_PREREQ(2.62) +AC_INIT([aspectbin],[0.5],[nbowler@draconx.ca]) +AC_CONFIG_SRCDIR([aspectbin.c]) +AC_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE([-Wall -Werror foreign]) + +AC_PROG_CC_C99 + +LT_INIT + +PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12.0]) +AC_SUBST(GTK_LIBS) +AC_SUBST(GTK_CFLAGS) + +PKG_CHECK_MODULES(GLADEUI, [gladeui-1.0 >= 3.4.5], + [have_glade=yes], [have_glade=no]) +AC_SUBST(GLADEUI_LIBS) +AC_SUBST(GLADEUI_CFLAGS) + +AM_CONDITIONAL([BUILD_GLADE], [test x"$have_glade" = x"yes"]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT -- 2.43.0