Makefile convert @var@ to $(var)

Avoid using @var@ since this could not be easily overwritten through
'make var=xxx' option which is normally available.
For Makefile.am users should avoid using @var@.

Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index b0781ca..e87f030 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,16 +28,16 @@ SUBDIRS = render_program legacy
 
 AM_CFLAGS = \
        @CWARNFLAGS@ \
-       @XORG_CFLAGS@ \
-       @DRM_CFLAGS@ \
-       @PCIACCESS_CFLAGS@ \
+       $(XORG_CFLAGS) \
+       $(DRM_CFLAGS) \
+       $(PCIACCESS_CFLAGS) \
        @NOWARNFLAGS@ \
        $(NULL)
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
-intel_drv_ladir = @moduledir@/drivers
-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(XORG_LIBS)
+intel_drv_ladir = $(moduledir)/drivers
+intel_drv_la_LIBADD = legacy/liblegacy.la $(PCIACCESS_LIBS) $(XORG_LIBS)
 
 if SNA
 SUBDIRS += sna

diff --git a/src/legacy/i810/Makefile.am b/src/legacy/i810/Makefile.am
index 8414c5f..8846e4e 100644 (file)
--- a/src/legacy/i810/Makefile.am
+++ b/src/legacy/i810/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = xvmc
 
 noinst_LTLIBRARIES = liblegacy-i810.la
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ @PCIACCESS_CFLAGS@ \
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) $(PCIACCESS_CFLAGS) \
            -I$(top_srcdir)/src \
            -I$(top_srcdir)/src/legacy \
            $(NULL)

diff --git a/src/legacy/i810/xvmc/Makefile.am b/src/legacy/i810/xvmc/Makefile.am
index 7f28b8b..6c40f20 100644 (file)
--- a/src/legacy/i810/xvmc/Makefile.am
+++ b/src/legacy/i810/xvmc/Makefile.am
@@ -5,7 +5,7 @@ endif
 libI810XvMC_la_SOURCES = I810XvMC.c \
                         I810XvMC.h
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI1_CFLAGS@ -DTRUE=1 -DFALSE=0
+AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DRM_CFLAGS) $(DRI1_CFLAGS) -DTRUE=1 -DFALSE=0
 
 libI810XvMC_la_LDFLAGS = -version-number 1:0:0
-libI810XvMC_la_LIBADD = @DRI1_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
+libI810XvMC_la_LIBADD = $(DRI1_LIBS) $(DRM_LIBS) $(XVMCLIB_LIBS)

diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index cdcd920..604ae25 100644 (file)
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -22,21 +22,21 @@ SUBDIRS = brw fb
 
 AM_CFLAGS = \
        @CWARNFLAGS@ \
+       @NOWARNFLAGS@ \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/render_program \
-       @XORG_CFLAGS@ \
-       @UDEV_CFLAGS@ \
-       @DRM_CFLAGS@ \
-       @NOWARNFLAGS@
+       $(XORG_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(DRM_CFLAGS) \
        $(NULL)
 
 if VALGRIND
-AM_CFLAGS += @VALGRIND_CFLAGS@
+AM_CFLAGS += $(VALGRIND_CFLAGS)
 endif
 
 noinst_LTLIBRARIES = libsna.la
 libsna_la_LDFLAGS = -pthread
-libsna_la_LIBADD = @UDEV_LIBS@ -lm @DRM_LIBS@ brw/libbrw.la fb/libfb.la
+libsna_la_LIBADD = $(UDEV_LIBS) -lm $(DRM_LIBS) brw/libbrw.la fb/libfb.la
 
 libsna_la_SOURCES = \
        atomic.h \

diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am
index 971ac21..4fa1b8c 100644 (file)
--- a/src/uxa/Makefile.am
+++ b/src/uxa/Makefile.am
@@ -18,12 +18,12 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
-AM_CFLAGS += @UDEV_CFLAGS@ @DRM_CFLAGS@ @DRMINTEL_CFLAGS@
+AM_CFLAGS = @CWARNFLAGS@ $(XORG_CFLAGS) $(DRM_CFLAGS) $(PCIACCESS_CFLAGS)
+AM_CFLAGS += $(UDEV_CFLAGS) $(DRM_CFLAGS) $(DRMINTEL_CFLAGS)
 AM_CFLAGS += -I$(top_srcdir)/xvmc -I$(top_srcdir)/src -I$(top_srcdir)/src/render_program
 
 noinst_LTLIBRARIES = libuxa.la
-libuxa_la_LIBADD = @UDEV_LIBS@ @DRMINTEL_LIBS@ @DRM_LIBS@
+libuxa_la_LIBADD = $(UDEV_LIBS) $(DRMINTEL_LIBS) $(DRM_LIBS)
 libuxa_la_SOURCES = \
        brw_defines.h \
        brw_structs.h \
@@ -62,21 +62,21 @@ libuxa_la_SOURCES = \
        $(NULL)
 
 if GLAMOR
-AM_CFLAGS += @LIBGLAMOR_CFLAGS@
-libuxa_la_LIBADD += @LIBGLAMOR_LIBS@
+AM_CFLAGS += $(LIBGLAMOR_CFLAGS)
+libuxa_la_LIBADD += $(LIBGLAMOR_LIBS)
 libuxa_la_SOURCES += \
         intel_glamor.c \
         $(NULL)
 endif
 
 if DRI2
-AM_CFLAGS += @DRI2_CFLAGS@
+AM_CFLAGS += $(DRI2_CFLAGS)
 libuxa_la_SOURCES += \
        intel_dri.c \
        $(NULL)
 libuxa_la_LIBADD += \
        $(DRI2_LIBS) \
-       @CLOCK_GETTIME_LIBS@ \
+       $(CLOCK_GETTIME_LIBS) \
        $(NULL)
 endif
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 0b5f8a0..5c2a3e1 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -32,8 +32,8 @@ check_PROGRAMS = $(stress_TESTS)
 
 noinst_PROGRAMS = lowlevel-blt-bench
 
-AM_CFLAGS = @CWARNFLAGS@ @X11_CFLAGS@ @DRM_CFLAGS@
-LDADD = libtest.la @X11_LIBS@ @DRM_LIBS@ @CLOCK_GETTIME_LIBS@
+AM_CFLAGS = @CWARNFLAGS@ $(X11_CFLAGS) $(DRM_CFLAGS)
+LDADD = libtest.la $(X11_LIBS) $(DRM_LIBS) $(CLOCK_GETTIME_LIBS)
 
 noinst_LTLIBRARIES = libtest.la
 libtest_la_SOURCES = \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index de7e9b4..d294e2a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
 
 AM_CFLAGS = \
        @CWARNFLAGS@ \
-       @TOOL_CFLAGS@ \
+       $(TOOL_CFLAGS) \
        @NOWARNFLAGS@ \
        $(NULL)
 
@@ -33,7 +33,7 @@ intel_virtual_output_SOURCES = \
        virtual.c \
        $(NULL)
 
-intel_virtual_output_LDADD = @TOOL_LIBS@
+intel_virtual_output_LDADD = $(TOOL_LIBS)
 
 EXTRA_DIST = intel-virtual-output.man
 CLEANFILES = $(driverman_DATA)