diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-01-26 15:00:04 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-01-26 15:00:04 +0000 |
| commit | 6d675af065d65fb6d7925d2601709020c5d6a2f3 (patch) | |
| tree | d9d7ae302a6ec90305b4c62332831b47de2efda9 | |
| parent | c9a5f71f02eb4be2f6bf14f08dbd741bb7718bff (diff) | |
[configure] Syntax tweak.
Clean up the build scripts slightly.
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | configure.in | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index e6c7943..bcd8dce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,19 +42,20 @@ odin_SOURCES = src/odin.h \ src/minibfd/demangle.c\ src/minibfd/elfparser.h\ src/minibfd/elfparser.c -odin_CFLAGS = @ODIN_CFLAGS@ @gtk_CFLAGS@ \ +odin_CFLAGS = ${ODIN_CFLAGS} ${gtk_CFLAGS} \ -DLIBDIR="\"$(odinlibdir)\"" \ -DDATADIR="\"$(odindatadir)\"" -odin_LDADD = @gtk_LIBS@ -lz +odin_LDADD = ${gtk_LIBS} -lz odin_DEPENDENCIES = lwp.so lwp_la_SOURCES = src/lwp-events.h \ src/lwp.c -lwp_la_CFLAGS = @ODIN_CFLAGS@ @gtk_CFLAGS@ +lwp_la_CFLAGS = ${ODIN_CFLAGS} ${gtk_CFLAGS} lwp_la_LIBADD = -ldl lwp_la_LDFLAGS = -pthread -module -avoid-version -Wl,-z,initfirst CLEANFILES=lwp.so -%.so: %.la +# convenience hack +.so.la: $(RM) $@ $(LN_S) .libs/$*.so $@ diff --git a/configure.in b/configure.in index 10afac4..12a8b35 100644 --- a/configure.in +++ b/configure.in @@ -9,6 +9,7 @@ AC_INIT([odin], [chris@chris-wilson.co.uk]) AM_INIT_AUTOMAKE([1.9]) +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC AC_PROG_CC_C_O @@ -81,10 +82,12 @@ AC_CACHE_CHECK([for supported warning flags], odin_cv_warn_cflags, [ AC_MSG_CHECKING([which warning flags were supported])]) WARN_CFLAGS="$odin_cv_warn_cflags" ODIN_CFLAGS="$ODIN_CFLAGS $WARN_CFLAGS -ggdb3 -O0" -AC_SUBST([WARN_CFLAGS ODIN_CFLAGS]) +AC_SUBST(WARN_CFLAGS) +AC_SUBST(ODIN_CFLAGS) PKG_CHECK_MODULES(gtk, [gtk+-2.0 >= 2.12.0 gnet-2.0 libgtop-2.0]) -AC_SUBST([gtk_CFLAGS gtk_LIBS]) +AC_SUBST(gtk_CFLAGS) +AC_SUBST(gtk_LIBS) AC_CONFIG_FILES([ Makefile |