ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

set per-target CPPFLAGS for lumigui instead of global AM_CPPFLAGS

Browse source 
this prevents strange (_CPPFLAGS) dependencies such as the one that was identified and fixed in admin/Makefile.am
Also, make sure to include the global $(AM_CPPFLAGS) flags in the per-target ones
This commit is contained in:
Michael Ploujnikov 2008-08-30 11:49:31 -04:00
parent bbab414f66
commit 8bbcc57f48
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/Makefile.am
View file

@ -24,5 +24,5 @@ vgsuppression_LDADD = liblumi.a -lnobugmt -lpthread -ldl
noinst_PROGRAMS += rsvg-convert
rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c
rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
rsvg_convert_CPPFLAGS = $(GTK_LUMIERA_CFLAGS) $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2

2
src/gui/Makefile.am
View file

@ -21,7 +21,7 @@ lumigui_srcdir = $(top_srcdir)/src/gui
#lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
#lumigui_CPPFLAGS = -I$(top_srcdir)/src/
AM_CPPFLAGS = \
lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \