diff options
| author | Benjamin Otte <otte@redhat.com> | 2011-09-14 17:52:03 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2011-09-28 01:48:02 +0200 |
| commit | 01c2dcbe6936a868651160d2617d783d5b8d3d7d (patch) | |
| tree | f3c397749a30c5704964fa109a290cf10bd2a6ed | |
| parent | 100f16eae94a54fbb9ee1f44fa3c34602ba25c4d (diff) | |
build: replace @VAR@ with $(VAR) in makefiles
| -rw-r--r-- | demos/Makefile.am | 4 | ||||
| -rw-r--r-- | test/Makefile.am | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/demos/Makefile.am b/demos/Makefile.am index f91e628..070c2d7 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -1,7 +1,7 @@ if HAVE_GTK -AM_CFLAGS = @OPENMP_CFLAGS@ -AM_LDFLAGS = @OPENMP_CFLAGS@ +AM_CFLAGS = $(OPENMP_CFLAGS) +AM_LDFLAGS = $(OPENMP_CFLAGS) LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS) INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS) diff --git a/test/Makefile.am b/test/Makefile.am index 802d3f4..eeb3679 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,9 +1,9 @@ include $(top_srcdir)/test/Makefile.sources -AM_CFLAGS = @OPENMP_CFLAGS@ -AM_LDFLAGS = @OPENMP_CFLAGS@ @TESTPROGS_EXTRA_LDFLAGS@ -LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm @PNG_LIBS@ -INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman @PNG_CFLAGS@ +AM_CFLAGS = $(OPENMP_CFLAGS) +AM_LDFLAGS = $(OPENMP_CFLAGS) $(TESTPROGS_EXTRA_LDFLAGS) +LDADD = libutils.la $(top_builddir)/pixman/libpixman-1.la -lm $(PNG_LIBS) +INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(PNG_CFLAGS) libutils_la_SOURCES = $(libutils_sources) $(libutils_headers) |