From 291b6aa31b7dc11fde0648f1a909838e19875856 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Mon, 7 May 2012 04:32:36 +0200 Subject: build system: fixed AM_CFLAGS handling when using per-target CFLAGS, AM_CFLAGS are ignored --- lib/gtk-vlc-player/Makefile.am | 3 ++- src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/gtk-vlc-player/Makefile.am b/lib/gtk-vlc-player/Makefile.am index c5241ef..2d7a7c1 100644 --- a/lib/gtk-vlc-player/Makefile.am +++ b/lib/gtk-vlc-player/Makefile.am @@ -5,7 +5,8 @@ vlcplayer_datadir = @datarootdir@/gtk-vlc-player lib_LTLIBRARIES = libgtk-vlc-player.la libgtk_vlc_player_la_SOURCES = gtk-vlc-player.c gtk-vlc-player.h -libgtk_vlc_player_la_CFLAGS = @LIBGTK_CFLAGS@ @LIBVLC_CFLAGS@ +libgtk_vlc_player_la_CFLAGS = $(AM_CFLAGS) \ + @LIBGTK_CFLAGS@ @LIBVLC_CFLAGS@ libgtk_vlc_player_la_LIBADD = @LIBGTK_LIBS@ @LIBVLC_LIBS@ include_HEADERS = gtk-vlc-player.h diff --git a/src/Makefile.am b/src/Makefile.am index 6fa4307..f69a513 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = -Wall bin_PROGRAMS = experiment-player experiment_player_SOURCES = main.c -experiment_player_CFLAGS = +experiment_player_CFLAGS = $(AM_CFLAGS) experiment_player_CPPFLAGS = -DDEFAULT_UI='"@DEFAULT_UI@"' experiment_player_LDFLAGS = experiment_player_LDADD = -- cgit v1.2.3