Mercurial > MadButterfly
changeset 927:6d4b8c4051ff
Depend on cairo or pangocairo according enabling of sh_text
| author | Thinker K.F. Li <thinker@codemud.net> |
|---|---|
| date | Wed, 27 Oct 2010 01:17:37 +0800 |
| parents | 757bb247a072 |
| children | 35b6a9411e26 |
| files | config.mk examples/calculator/Makefile.am examples/drag/Makefile.am examples/tank/Makefile.am |
| diffstat | 4 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/config.mk Wed Oct 27 01:03:46 2010 +0800 +++ b/config.mk Wed Oct 27 01:17:37 2010 +0800 @@ -1,1 +1,9 @@ INCLUDES = -I$(top_srcdir)/include + +if SH_TEXT +APPCFLAGS = @pangocairo_CFLAGS@ +APPLDFLAGS = @pangocairo_LIBS@ +else +APPCFLAGS = @cairo_CFLAGS@ +APPLDFLAGS = @cairo_LIBS@ +endif \ No newline at end of file
--- a/examples/calculator/Makefile.am Wed Oct 27 01:03:46 2010 +0800 +++ b/examples/calculator/Makefile.am Wed Oct 27 01:17:37 2010 +0800 @@ -5,8 +5,8 @@ calc_SOURCES = main.c nodist_calc_SOURCES = calculator_scr.c calculator_scr.h -calc_CPPFLAGS = @cairo_CFLAGS@ $(INCLUDES) -calc_LDFLAGS = @cairo_LIBS@ +calc_CPPFLAGS = $(APPCFLAGS) $(INCLUDES) +calc_LDFLAGS = $(APPLDFLAGS) calc_LDADD = $(top_builddir)/src/libmbfly.la BUILT_SOURCES = calculator_scr.c calculator_scr.h calculator_scr.mb CLEANFILES = calculator_scr.c calculator_scr.h calculator_scr.mb
--- a/examples/drag/Makefile.am Wed Oct 27 01:03:46 2010 +0800 +++ b/examples/drag/Makefile.am Wed Oct 27 01:17:37 2010 +0800 @@ -5,8 +5,8 @@ ex1_SOURCES = main.c nodist_ex1_SOURCES = menu.c menu.h -ex1_CPPFLAGS = @cairo_CFLAGS@ -I$(top_srcdir) -ex1_LDFLAGS = @cairo_LIBS@ +ex1_CPPFLAGS = $(APPCFLAGS) -I$(top_srcdir) +ex1_LDFLAGS = $(APPLDFLAGS) ex1_LDADD = $(top_builddir)/src/libmbfly.la BUILT_SOURCES = menu.c menu.h menu.mb CLEANFILES = menu.c menu.h menu.mb
--- a/examples/tank/Makefile.am Wed Oct 27 01:03:46 2010 +0800 +++ b/examples/tank/Makefile.am Wed Oct 27 01:17:37 2010 +0800 @@ -7,8 +7,8 @@ tank_SOURCES = tank_main.c nodist_tank_SOURCES = svgs.h \ $(svg_sources) $(svg_sources:.c=.h) $(svg_sources:.c=.mb) -tank_CPPFLAGS = @cairo_CFLAGS@ -tank_LDFLAGS = @cairo_LIBS@ +tank_CPPFLAGS = $(APPCFLAGS) +tank_LDFLAGS = $(APPLDFLAGS) tank_LDADD = $(top_builddir)/src/libmbfly.la BUILT_SOURCES = svgs.h \ $(svg_sources) $(svg_sources:.c=.h) $(svg_sources:.c=.mb)