diff options
| author | Ignacio Casal Quinteiro <icq@gnome.org> | 2015-10-31 09:41:10 +0100 |
|---|---|---|
| committer | Ignacio Casal Quinteiro <icq@gnome.org> | 2015-10-31 09:41:10 +0100 |
| commit | b1b59df9e127c74e54cae22958292ad1f5450376 (patch) | |
| tree | dc2a9b350c3b489cc131b974c730f63fe58821b2 | |
| parent | 60fcbef051e30acb8ab766299c27eb2fe7063d33 (diff) | |
| download | libcroco-b1b59df9e127c74e54cae22958292ad1f5450376.tar.gz | |
Replace deprecated INCLUDES with CPPFLAGS
| -rw-r--r-- | csslint/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/Makefile.am | 44 |
2 files changed, 27 insertions, 26 deletions
diff --git a/csslint/Makefile.am b/csslint/Makefile.am index 8209537..3969962 100644 --- a/csslint/Makefile.am +++ b/csslint/Makefile.am @@ -3,15 +3,16 @@ bin_PROGRAMS = csslint-0.6 csslint_0_6_SOURCES = csslint.c -croco_lib=$(top_builddir)/src/@CROCO_LIB@ -LDADD=$(croco_lib) +croco_lib = $(top_builddir)/src/@CROCO_LIB@ -INCLUDES=-I$(top_srcdir)/intl \ +csslint_0_6_LDADD = $(croco_lib) + +csslint_0_6_CPPFLAGS = \ + -I$(top_srcdir)/intl \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(CROCO_CFLAGS) csslint_0_6_LDFLAGS=$(CROCO_LIBS) -AM_CFLAGS=$(INCLUDES) #EXTRA_DIST = $(man_MANS) diff --git a/tests/Makefile.am b/tests/Makefile.am index 54bd099..f8bf6bc 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,32 +1,32 @@ -SUBDIRS=test-inputs test-output-refs -EXTRA_DIST=testctl vg.supp global-vars.sh.in valgrind-version.sh \ +SUBDIRS = test-inputs test-output-refs +EXTRA_DIST = testctl vg.supp global-vars.sh.in valgrind-version.sh \ test-prop-ident.sh test-unknown-at-rule.sh test-unknown-at-rule2.sh \ test-several-media.sh #the list of all possible tests goes here. -EXTRALDFLAGS=$(CROCO_LIBS) +EXTRALDFLAGS = $(CROCO_LIBS) testprogs=test0 test1 test2 test3 test4 test5 test6 -noinst_PROGRAMS=$(testprogs) -test0_SOURCES=test0-main.c -test0_LDFLAGS=$(EXTRALDFLAGS) -test1_SOURCES=test1-main.c -test1_LDFLAGS=$(EXTRALDFLAGS) -test2_SOURCES=test2-main.c cr-test-utils.c cr-test-utils.h -test2_LDFLAGS=$(EXTRALDFLAGS) -test3_SOURCES=test3-main.c cr-test-utils.c cr-test-utils.h -test3_LDFLAGS=$(EXTRALDFLAGS) -test4_SOURCES=test4-main.c cr-test-utils.c cr-test-utils.h -test4_LDFLAGS=$(EXTRALDFLAGS) -test5_SOURCES=test5-main.c cr-test-utils.c cr-test-utils.h -test5_LDFLAGS=$(EXTRALDFLAGS) -test6_SOURCES=test6-main.c cr-test-utils.c cr-test-utils.h -test6_LDFLAGS=$(EXTRALDFLAGS) +noinst_PROGRAMS = $(testprogs) +test0_SOURCES = test0-main.c +test0_LDFLAGS = $(EXTRALDFLAGS) +test1_SOURCES = test1-main.c +test1_LDFLAGS = $(EXTRALDFLAGS) +test2_SOURCES = test2-main.c cr-test-utils.c cr-test-utils.h +test2_LDFLAGS = $(EXTRALDFLAGS) +test3_SOURCES = test3-main.c cr-test-utils.c cr-test-utils.h +test3_LDFLAGS = $(EXTRALDFLAGS) +test4_SOURCES = test4-main.c cr-test-utils.c cr-test-utils.h +test4_LDFLAGS = $(EXTRALDFLAGS) +test5_SOURCES = test5-main.c cr-test-utils.c cr-test-utils.h +test5_LDFLAGS = $(EXTRALDFLAGS) +test6_SOURCES = test6-main.c cr-test-utils.c cr-test-utils.h +test6_LDFLAGS = $(EXTRALDFLAGS) -croco_lib=$(top_builddir)/src/@CROCO_LIB@ -LDADD=$(croco_lib) +croco_lib = $(top_builddir)/src/@CROCO_LIB@ +LDADD = $(croco_lib) -INCLUDES=-I$(top_srcdir)/intl -I$(top_srcdir)/src -I$(top_builddir)/src +AM_CPPFLAGS = -I$(top_srcdir)/intl -I$(top_srcdir)/src -I$(top_builddir)/src -AM_CFLAGS=-I. $(CROCO_CFLAGS) +AM_CFLAGS = -I. $(CROCO_CFLAGS) |