diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2013-11-25 09:09:20 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-11-25 09:25:56 +0000 |
| commit | 2275ef581ee1a1c45a45df40f952779f62fb53ed (patch) | |
| tree | 9cc452947b745cb77a32945cb92563b83bb592cb /src/uxa | |
| parent | 12e974c7bc8c85dbccd3d9ef91c1315e85bbeb6c (diff) | |
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>
Diffstat (limited to 'src/uxa')
| -rw-r--r-- | src/uxa/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/uxa/Makefile.am b/src/uxa/Makefile.am index 971ac211..4fa1b8cc 100644 --- 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 |