From: Juerg Billeter Date: Tue, 27 Nov 2007 20:51:25 +0000 (+0000) Subject: don't use filter function in makefiles as it's a GNU make extension X-Git-Tag: VALA_0_1_6~138 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fafcf37d381ceec302e423110304037024e1cce;p=platform%2Fupstream%2Fvala.git don't use filter function in makefiles as it's a GNU make extension 2007-11-27 Juerg Billeter * ccode/Makefile.am, compiler/Makefile.am, gee/Makefile.am, gen-project/Makefile.am, gobject/Makefile.am, tests/Makefile.am, vala/Makefile.am, vapigen/Makefile.am: don't use filter function in makefiles as it's a GNU make extension svn path=/trunk/; revision=729 --- diff --git a/ChangeLog b/ChangeLog index b0587bd..8d0cf8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-11-27 Jürg Billeter + * ccode/Makefile.am, compiler/Makefile.am, gee/Makefile.am, + gen-project/Makefile.am, gobject/Makefile.am, tests/Makefile.am, + vala/Makefile.am, vapigen/Makefile.am: don't use filter function in + makefiles as it's a GNU make extension + +2007-11-27 Jürg Billeter + * configure.ac: add AM_MAINTAINER_MODE * autogen.sh: enable maintainer mode by default diff --git a/ccode/Makefile.am b/ccode/Makefile.am index 348d8c6..5ecbcde 100644 --- a/ccode/Makefile.am +++ b/ccode/Makefile.am @@ -12,214 +12,70 @@ noinst_LTLIBRARIES = \ $(NULL) libvalaccode_la_VALASOURCES = \ - $(NULL) - -libvalaccode_la_SOURCES = \ - ccode.vala.stamp \ - valaccodeassignment.c \ - valaccodeassignment.h \ valaccodeassignment.vala \ - valaccodebinaryexpression.c \ - valaccodebinaryexpression.h \ valaccodebinaryexpression.vala \ - valaccodeblock.c \ - valaccodeblock.h \ valaccodeblock.vala \ - valaccodebreakstatement.c \ - valaccodebreakstatement.h \ valaccodebreakstatement.vala \ - valaccodecasestatement.c \ - valaccodecasestatement.h \ valaccodecasestatement.vala \ - valaccodecastexpression.c \ - valaccodecastexpression.h \ valaccodecastexpression.vala \ - valaccodecommaexpression.c \ - valaccodecommaexpression.h \ valaccodecommaexpression.vala \ - valaccodecomment.c \ - valaccodecomment.h \ valaccodecomment.vala \ - valaccodeconditionalexpression.c \ - valaccodeconditionalexpression.h \ valaccodeconditionalexpression.vala \ - valaccodeconstant.c \ - valaccodeconstant.h \ valaccodeconstant.vala \ - valaccodecontinuestatement.c \ - valaccodecontinuestatement.h \ valaccodecontinuestatement.vala \ - valaccodedeclaration.c \ - valaccodedeclaration.h \ valaccodedeclaration.vala \ - valaccodedeclarator.c \ - valaccodedeclarator.h \ valaccodedeclarator.vala \ - valaccodedostatement.c \ - valaccodedostatement.h \ valaccodedostatement.vala \ - valaccodeemptystatement.c \ - valaccodeemptystatement.h \ valaccodeemptystatement.vala \ - valaccodeenum.c \ - valaccodeenum.h \ valaccodeenum.vala \ - valaccodeenumvalue.c \ - valaccodeenumvalue.h \ valaccodeenumvalue.vala \ - valaccodeexpression.c \ - valaccodeexpression.h \ valaccodeexpression.vala \ - valaccodeexpressionstatement.c \ - valaccodeexpressionstatement.h \ valaccodeexpressionstatement.vala \ - valaccodeformalparameter.c \ - valaccodeformalparameter.h \ valaccodeformalparameter.vala \ - valaccodeforstatement.c \ - valaccodeforstatement.h \ valaccodeforstatement.vala \ - valaccodefragment.c \ - valaccodefragment.h \ valaccodefragment.vala \ - valaccodefunction.c \ - valaccodefunction.h \ valaccodefunction.vala \ - valaccodefunctioncall.c \ - valaccodefunctioncall.h \ valaccodefunctioncall.vala \ - valaccodefunctiondeclarator.c \ - valaccodefunctiondeclarator.h \ valaccodefunctiondeclarator.vala \ - valaccodegotostatement.c \ - valaccodegotostatement.h \ valaccodegotostatement.vala \ - valaccodeidentifier.c \ - valaccodeidentifier.h \ valaccodeidentifier.vala \ - valaccodeifstatement.c \ - valaccodeifstatement.h \ valaccodeifstatement.vala \ - valaccodeincludedirective.c \ - valaccodeincludedirective.h \ valaccodeincludedirective.vala \ - valaccodeinitializerlist.c \ - valaccodeinitializerlist.h \ valaccodeinitializerlist.vala \ - valaccodelabel.c \ - valaccodelabel.h \ valaccodelabel.vala \ - valaccodelinedirective.c \ - valaccodelinedirective.h \ valaccodelinedirective.vala \ - valaccodemacroreplacement.c \ - valaccodemacroreplacement.h \ valaccodemacroreplacement.vala \ - valaccodememberaccess.c \ - valaccodememberaccess.h \ valaccodememberaccess.vala \ - valaccodemodifiers.c \ - valaccodemodifiers.h \ valaccodemodifiers.vala \ - valaccodenewline.c \ - valaccodenewline.h \ valaccodenewline.vala \ - valaccodenode.c \ - valaccodenode.h \ valaccodenode.vala \ - valaccodeoncesection.c \ - valaccodeoncesection.h \ valaccodeoncesection.vala \ - valaccodeparenthesizedexpression.c \ - valaccodeparenthesizedexpression.h \ valaccodeparenthesizedexpression.vala \ - valaccodereturnstatement.c \ - valaccodereturnstatement.h \ valaccodereturnstatement.vala \ - valaccodestatement.c \ - valaccodestatement.h \ valaccodestatement.vala \ - valaccodestruct.c \ - valaccodestruct.h \ valaccodestruct.vala \ - valaccodeswitchstatement.c \ - valaccodeswitchstatement.h \ valaccodeswitchstatement.vala \ - valaccodetypedefinition.c \ - valaccodetypedefinition.h \ valaccodetypedefinition.vala \ - valaccodeunaryexpression.c \ - valaccodeunaryexpression.h \ valaccodeunaryexpression.vala \ - valaccodevariabledeclarator.c \ - valaccodevariabledeclarator.h \ valaccodevariabledeclarator.vala \ - valaccodewhilestatement.c \ - valaccodewhilestatement.h \ valaccodewhilestatement.vala \ - valaccodewriter.c \ - valaccodewriter.h \ valaccodewriter.vala \ - valaccodeelementaccess.c \ - valaccodeelementaccess.h \ valaccodeelementaccess.vala \ $(NULL) +libvalaccode_la_SOURCES = \ + ccode.vala.stamp \ + $(libvalaccode_la_VALASOURCES:.vala=.c) \ + $(libvalaccode_la_VALASOURCES:.vala=.h) \ + $(NULL) + ccodeincludedir = $(includedir)/vala-1.0/ccode ccodeinclude_HEADERS = \ - valaccodeassignment.h \ - valaccodebinaryexpression.h \ - valaccodeblock.h \ - valaccodebreakstatement.h \ - valaccodecasestatement.h \ - valaccodecastexpression.h \ - valaccodecommaexpression.h \ - valaccodecomment.h \ - valaccodeconditionalexpression.h \ - valaccodeconstant.h \ - valaccodecontinuestatement.h \ - valaccodedeclaration.h \ - valaccodedeclarator.h \ - valaccodedostatement.h \ - valaccodeemptystatement.h \ - valaccodeenum.h \ - valaccodeenumvalue.h \ - valaccodeexpression.h \ - valaccodeexpressionstatement.h \ - valaccodeformalparameter.h \ - valaccodeforstatement.h \ - valaccodefragment.h \ - valaccodefunction.h \ - valaccodefunctioncall.h \ - valaccodefunctiondeclarator.h \ - valaccodegotostatement.h \ - valaccodeidentifier.h \ - valaccodeifstatement.h \ - valaccodeincludedirective.h \ - valaccodeinitializerlist.h \ - valaccodelabel.h \ - valaccodelinedirective.h \ - valaccodemacroreplacement.h \ - valaccodememberaccess.h \ - valaccodemodifiers.h \ - valaccodenewline.h \ - valaccodenode.h \ - valaccodeoncesection.h \ - valaccodeparenthesizedexpression.h \ - valaccodereturnstatement.h \ - valaccodestatement.h \ - valaccodestruct.h \ - valaccodeswitchstatement.h \ - valaccodetypedefinition.h \ - valaccodeunaryexpression.h \ - valaccodevariabledeclarator.h \ - valaccodewhilestatement.h \ - valaccodewriter.h \ - valaccodeelementaccess.h \ + $(libvalaccode_la_VALASOURCES:.vala=.h) \ $(NULL) -ccode.vapi ccode.vala.stamp: $(filter %.vala,$(libvalaccode_la_SOURCES)) +ccode.vapi ccode.vala.stamp: $(libvalaccode_la_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --basedir $(top_srcdir) --library ccode $^ touch $@ diff --git a/compiler/Makefile.am b/compiler/Makefile.am index 2755465..6c4d044 100644 --- a/compiler/Makefile.am +++ b/compiler/Makefile.am @@ -13,14 +13,17 @@ bin_PROGRAMS = \ valac \ $(NULL) +valac_VALASOURCES = \ + valacompiler.vala \ + $(NULL) + valac_SOURCES = \ valac.vala.stamp \ - valacompiler.c \ - valacompiler.h \ - valacompiler.vala \ + $(valac_VALASOURCES:.vala=.c) \ + $(valac_VALASOURCES:.vala=.h) \ $(NULL) -valac.vala.stamp: $(filter %.vala,$(valac_SOURCES)) +valac.vala.stamp: $(valac_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject --pkg gobject --pkg config --basedir $(top_srcdir) $^ touch $@ diff --git a/gee/Makefile.am b/gee/Makefile.am index 0681f08..89b4aee 100644 --- a/gee/Makefile.am +++ b/gee/Makefile.am @@ -11,68 +11,35 @@ noinst_LTLIBRARIES = \ libgee.la $(NULL) -libgee_la_SOURCES = \ - gee.vala.stamp \ - arraylist.c \ - arraylist.h \ +libgee_la_VALASOURCES = \ arraylist.vala \ - collection.c \ - collection.h \ collection.vala \ - hashmap.c \ - hashmap.h \ hashmap.vala \ - hashset.c \ - hashset.h \ hashset.vala \ - iterable.c \ - iterable.h \ iterable.vala \ - iterator.c \ - iterator.h \ iterator.vala \ - list.c \ - list.h \ list.vala \ - map.c \ - map.h \ map.vala \ - readonlycollection.c \ - readonlycollection.h \ readonlycollection.vala \ - readonlylist.c \ - readonlylist.h \ readonlylist.vala \ - readonlymap.c \ - readonlymap.h \ readonlymap.vala \ - readonlyset.c \ - readonlyset.h \ readonlyset.vala \ - set.c \ - set.h \ set.vala \ $(NULL) +libgee_la_SOURCES = \ + gee.vala.stamp \ + $(libgee_la_VALASOURCES:.vala=.c) \ + $(libgee_la_VALASOURCES:.vala=.h) \ + $(NULL) + geeincludedir = $(includedir)/vala-1.0/gee geeinclude_HEADERS = \ - arraylist.h \ - collection.h \ - hashmap.h \ - hashset.h \ - iterable.h \ - iterator.h \ - list.h \ - map.h \ - readonlycollection.h \ - readonlylist.h \ - readonlymap.h \ - readonlyset.h \ - set.h \ + $(libgee_la_VALASOURCES:.vala=.h) \ $(NULL) -gee.vapi gee.vala.stamp: $(filter %.vala,$(libgee_la_SOURCES)) +gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --basedir $(top_srcdir) --library gee $^ touch $@ diff --git a/gen-project/Makefile.am b/gen-project/Makefile.am index 246b41c..a17900a 100644 --- a/gen-project/Makefile.am +++ b/gen-project/Makefile.am @@ -14,14 +14,17 @@ bin_PROGRAMS = \ vala-gen-project \ $(NULL) +vala_gen_project_VALASOURCES = \ + valaprojectgenerator.vala \ + $(NULL) + vala_gen_project_SOURCES = \ vala-gen-project.vala.stamp \ - valaprojectgenerator.c \ - valaprojectgenerator.h \ - valaprojectgenerator.vala \ + $(vala_gen_project_VALASOURCES:.vala=.c) \ + $(vala_gen_project_VALASOURCES:.vala=.h) \ $(NULL) -vala-gen-project.vala.stamp: $(filter %.vala,$(vala_gen_project_SOURCES)) +vala-gen-project.vala.stamp: $(vala_gen_project_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --pkg config --pkg gtk+-2.0 --basedir $(top_srcdir) $^ touch $@ diff --git a/gobject/Makefile.am b/gobject/Makefile.am index d07c76b..b62eaeb 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -11,100 +11,43 @@ lib_LTLIBRARIES = \ libvala.la $(NULL) -libvala_la_SOURCES = \ - gobject.vala.stamp \ - valaccodearraycreationexpressionbinding.c \ - valaccodearraycreationexpressionbinding.h \ +libvala_la_VALASOURCES = \ valaccodearraycreationexpressionbinding.vala \ - valaccodeassignmentbinding.c \ - valaccodeassignmentbinding.h \ valaccodeassignmentbinding.vala \ - valaccodebinding.c \ - valaccodebinding.h \ valaccodebinding.vala \ - valaccodecompiler.c \ - valaccodecompiler.h \ valaccodecompiler.vala \ - valaccodeelementaccessbinding.c \ - valaccodeelementaccessbinding.h \ valaccodeelementaccessbinding.vala \ - valaccodeexpressionbinding.c \ - valaccodeexpressionbinding.h \ valaccodeexpressionbinding.vala \ - valaccodegenerator.c \ - valaccodegenerator.h \ valaccodegenerator.vala \ - valaccodegeneratorclass.c \ - valaccodegeneratorclass.h \ valaccodegeneratorclass.vala \ - valaccodegeneratorinterface.c \ - valaccodegeneratorinterface.h \ valaccodegeneratorinterface.vala \ - valaccodegeneratorinvocationexpression.c \ - valaccodegeneratorinvocationexpression.h \ valaccodegeneratorinvocationexpression.vala \ - valaccodegeneratormemberaccess.c \ - valaccodegeneratormemberaccess.h \ valaccodegeneratormemberaccess.vala \ - valaccodegeneratormethod.c \ - valaccodegeneratormethod.h \ valaccodegeneratormethod.vala \ - valaccodegeneratorsignal.c \ - valaccodegeneratorsignal.h \ valaccodegeneratorsignal.vala \ - valaccodegeneratorsourcefile.c \ - valaccodegeneratorsourcefile.h \ valaccodegeneratorsourcefile.vala \ - valaccodegeneratorstruct.c \ - valaccodegeneratorstruct.h \ valaccodegeneratorstruct.vala \ - valaclassregisterfunction.c \ - valaclassregisterfunction.h \ valaclassregisterfunction.vala \ - valadbusbindingprovider.c \ - valadbusbindingprovider.h \ valadbusbindingprovider.vala \ - valadbusmethod.c \ - valadbusmethod.h \ valadbusmethod.vala \ - valadbussignal.c \ - valadbussignal.h \ valadbussignal.vala \ - valainterfaceregisterfunction.c \ - valainterfaceregisterfunction.h \ valainterfaceregisterfunction.vala \ - valatyperegisterfunction.c \ - valatyperegisterfunction.h \ valatyperegisterfunction.vala \ $(NULL) +libvala_la_SOURCES = \ + gobject.vala.stamp \ + $(libvala_la_VALASOURCES:.vala=.c) \ + $(libvala_la_VALASOURCES:.vala=.h) \ + $(NULL) + gobjectincludedir = $(includedir)/vala-1.0/gobject gobjectinclude_HEADERS = \ - valaccodearraycreationexpressionbinding.h \ - valaccodeassignmentbinding.h \ - valaccodebinding.h \ - valaccodecompiler.h \ - valaccodeelementaccessbinding.h \ - valaccodeexpressionbinding.h \ - valaccodegenerator.h \ - valaccodegeneratorclass.h \ - valaccodegeneratorinterface.h \ - valaccodegeneratorinvocationexpression.h \ - valaccodegeneratormemberaccess.h \ - valaccodegeneratormethod.h \ - valaccodegeneratorsignal.h \ - valaccodegeneratorsourcefile.h \ - valaccodegeneratorstruct.h \ - valaclassregisterfunction.h \ - valadbusbindingprovider.h \ - valadbusmethod.h \ - valadbussignal.h \ - valainterfaceregisterfunction.h \ - valatyperegisterfunction.h \ + $(libvala_la_VALASOURCES:.vala=.h) \ $(NULL) -gobject.vapi gobject.vala.stamp: $(filter %.vala,$(libvala_la_SOURCES)) +gobject.vapi gobject.vala.stamp: $(libvala_la_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --basedir $(top_srcdir) --library gobject $^ touch $@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 6e7ddc1..149eb20 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,14 +19,17 @@ BUILT_SOURCES += testenchant.stamp noinst_PROGRAMS += testenchant endif +testenchant_VALASOURCES = \ + testenchant.vala \ + $(NULL) + testenchant_SOURCES = \ testenchant.stamp \ - testenchant.c \ - testenchant.h \ - testenchant.vala \ + $(testenchant_VALASOURCES:.vala=.c) \ + $(testenchant_VALASOURCES:.vala=.h) \ $(NULL) -testenchant.stamp: $(filter %.vala,$(testenchant_SOURCES)) +testenchant.stamp: $(testenchant_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --pkg enchant $^ touch $@ diff --git a/vala/Makefile.am b/vala/Makefile.am index 413586d..64373d8 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -12,432 +12,129 @@ noinst_LTLIBRARIES = \ libvalacore.la $(NULL) -libvalacore_la_SOURCES = \ - parser.y \ - scanner.l \ - vala.h \ - vala.vala.stamp \ - valaaddressofexpression.c \ - valaaddressofexpression.h \ +libvalacore_la_VALASOURCES = \ valaaddressofexpression.vala \ - valaarray.c \ - valaarray.h \ valaarray.vala \ - valaarraycreationexpression.c \ - valaarraycreationexpression.h \ valaarraycreationexpression.vala \ - valaarraylengthfield.c \ - valaarraylengthfield.h \ valaarraylengthfield.vala \ - valaarraymovemethod.c \ - valaarraymovemethod.h \ valaarraymovemethod.vala \ - valaarrayresizemethod.c \ - valaarrayresizemethod.h \ valaarrayresizemethod.vala \ - valaassignment.c \ - valaassignment.h \ valaassignment.vala \ - valaattribute.c \ - valaattribute.h \ valaattribute.vala \ - valaattributeprocessor.c \ - valaattributeprocessor.h \ valaattributeprocessor.vala \ - valabaseaccess.c \ - valabaseaccess.h \ valabaseaccess.vala \ - valabinaryexpression.c \ - valabinaryexpression.h \ valabinaryexpression.vala \ - valabindingprovider.c \ - valabindingprovider.h \ valabindingprovider.vala \ - valablock.c \ - valablock.h \ valablock.vala \ - valabooleanliteral.c \ - valabooleanliteral.h \ valabooleanliteral.vala \ - valabreakstatement.c \ - valabreakstatement.h \ valabreakstatement.vala \ - valacallback.c \ - valacallback.h \ valacallback.vala \ - valacastexpression.c \ - valacastexpression.h \ valacastexpression.vala \ - valacatchclause.c \ - valacatchclause.h \ valacatchclause.vala \ - valacharacterliteral.c \ - valacharacterliteral.h \ valacharacterliteral.vala \ - valaclass.c \ - valaclass.h \ valaclass.vala \ - valacodebinding.c \ - valacodebinding.h \ valacodebinding.vala \ - valacodecontext.c \ - valacodecontext.h \ valacodecontext.vala \ - valacodegenerator.c \ - valacodegenerator.h \ valacodegenerator.vala \ - valacodenode.c \ - valacodenode.h \ valacodenode.vala \ - valacodevisitor.c \ - valacodevisitor.h \ valacodevisitor.vala \ - valaconditionalexpression.c \ - valaconditionalexpression.h \ valaconditionalexpression.vala \ - valaconstant.c \ - valaconstant.h \ valaconstant.vala \ - valaconstructor.c \ - valaconstructor.h \ valaconstructor.vala \ - valacontinuestatement.c \ - valacontinuestatement.h \ valacontinuestatement.vala \ - valacreationmethod.c \ - valacreationmethod.h \ valacreationmethod.vala \ - valadatatype.c \ - valadatatype.h \ valadatatype.vala \ - valadeclarationstatement.c \ - valadeclarationstatement.h \ valadeclarationstatement.vala \ - valadestructor.c \ - valadestructor.h \ valadestructor.vala \ - valadostatement.c \ - valadostatement.h \ valadostatement.vala \ - valaelementaccess.c \ - valaelementaccess.h \ valaelementaccess.vala \ - valaemptystatement.c \ - valaemptystatement.h \ valaemptystatement.vala \ - valaenum.c \ - valaenum.h \ valaenum.vala \ - valaenumvalue.c \ - valaenumvalue.h \ valaenumvalue.vala \ - valaexpression.c \ - valaexpression.h \ valaexpression.vala \ - valaexpressionstatement.c \ - valaexpressionstatement.h \ valaexpressionstatement.vala \ - valafield.c \ - valafield.h \ valafield.vala \ - valaforeachstatement.c \ - valaforeachstatement.h \ valaforeachstatement.vala \ - valaformalparameter.c \ - valaformalparameter.h \ valaformalparameter.vala \ - valaforstatement.c \ - valaforstatement.h \ valaforstatement.vala \ - valaifstatement.c \ - valaifstatement.h \ valaifstatement.vala \ - valainitializerlist.c \ - valainitializerlist.h \ valainitializerlist.vala \ - valainstancecast.c \ - valainstancecast.h \ valainstancecast.vala \ - valaintegerliteral.c \ - valaintegerliteral.h \ valaintegerliteral.vala \ - valainterface.c \ - valainterface.h \ valainterface.vala \ - valainterfacewriter.c \ - valainterfacewriter.h \ valainterfacewriter.vala \ - valainvocationexpression.c \ - valainvocationexpression.h \ valainvocationexpression.vala \ - valainvokable.c \ - valainvokable.h \ valainvokable.vala \ - valalambdaexpression.c \ - valalambdaexpression.h \ valalambdaexpression.vala \ - valaliteral.c \ - valaliteral.h \ valaliteral.vala \ - valaliteralexpression.c \ - valaliteralexpression.h \ valaliteralexpression.vala \ - valalocalvariabledeclaration.c \ - valalocalvariabledeclaration.h \ valalocalvariabledeclaration.vala \ - valalockable.c \ - valalockable.h \ valalockable.vala \ - valalockstatement.c \ - valalockstatement.h \ valalockstatement.vala \ - valamember.c \ - valamember.h \ valamember.vala \ - valamemberaccess.c \ - valamemberaccess.h \ valamemberaccess.vala \ - valamemberinitializer.c \ - valamemberinitializer.h \ valamemberinitializer.vala \ - valamemorymanager.c \ - valamemorymanager.h \ valamemorymanager.vala \ - valamethod.c \ - valamethod.h \ valamethod.vala \ - valanamedargument.c \ - valanamedargument.h \ valanamedargument.vala \ - valanamespace.c \ - valanamespace.h \ valanamespace.vala \ - valanamespacereference.c \ - valanamespacereference.h \ valanamespacereference.vala \ - valanullliteral.c \ - valanullliteral.h \ valanullliteral.vala \ - valaobjectcreationexpression.c \ - valaobjectcreationexpression.h \ valaobjectcreationexpression.vala \ - valaparenthesizedexpression.c \ - valaparenthesizedexpression.h \ valaparenthesizedexpression.vala \ - valaparser.c \ - valaparser.h \ valaparser.vala \ - valapointer.c \ - valapointer.h \ valapointer.vala \ - valapointerindirection.c \ - valapointerindirection.h \ valapointerindirection.vala \ - valapostfixexpression.c \ - valapostfixexpression.h \ valapostfixexpression.vala \ - valapropertyaccessor.c \ - valapropertyaccessor.h \ valapropertyaccessor.vala \ - valaproperty.c \ - valaproperty.h \ valaproperty.vala \ - valarealliteral.c \ - valarealliteral.h \ valarealliteral.vala \ - valareferencetransferexpression.c \ - valareferencetransferexpression.h \ valareferencetransferexpression.vala \ - valareport.c \ - valareport.h \ valareport.vala \ - valareturnstatement.c \ - valareturnstatement.h \ valareturnstatement.vala \ - valascope.c \ - valascope.h \ valascope.vala \ - valasemanticanalyzer.c \ - valasemanticanalyzer.h \ valasemanticanalyzer.vala \ - valasignal.c \ - valasignal.h \ valasignal.vala \ - valasizeofexpression.c \ - valasizeofexpression.h \ valasizeofexpression.vala \ - valasourcefile.c \ - valasourcefile.h \ valasourcefile.vala \ - valasourcefilecycle.c \ - valasourcefilecycle.h \ valasourcefilecycle.vala \ - valasourcereference.c \ - valasourcereference.h \ valasourcereference.vala \ - valastatement.c \ - valastatement.h \ valastatement.vala \ - valastringliteral.c \ - valastringliteral.h \ valastringliteral.vala \ - valastruct.c \ - valastruct.h \ valastruct.vala \ - valaswitchlabel.c \ - valaswitchlabel.h \ valaswitchlabel.vala \ - valaswitchsection.c \ - valaswitchsection.h \ valaswitchsection.vala \ - valaswitchstatement.c \ - valaswitchstatement.h \ valaswitchstatement.vala \ - valasymbol.c \ - valasymbol.h \ valasymbol.vala \ - valasymbolresolver.c \ - valasymbolresolver.h \ valasymbolresolver.vala \ - valathrowstatement.c \ - valathrowstatement.h \ valathrowstatement.vala \ - valatrystatement.c \ - valatrystatement.h \ valatrystatement.vala \ - valatypecheck.c \ - valatypecheck.h \ valatypecheck.vala \ - valatypeofexpression.c \ - valatypeofexpression.h \ valatypeofexpression.vala \ - valatypeparameter.c \ - valatypeparameter.h \ valatypeparameter.vala \ - valatypereference.c \ - valatypereference.h \ valatypereference.vala \ - valaunaryexpression.c \ - valaunaryexpression.h \ valaunaryexpression.vala \ - valavariabledeclarator.c \ - valavariabledeclarator.h \ valavariabledeclarator.vala \ - valawhilestatement.c \ - valawhilestatement.h \ valawhilestatement.vala \ $(NULL) +libvalacore_la_SOURCES = \ + parser.y \ + scanner.l \ + vala.h \ + vala.vala.stamp \ + $(libvalacore_la_VALASOURCES:.vala=.c) \ + $(libvalacore_la_VALASOURCES:.vala=.h) \ + $(NULL) + valaincludedir = $(includedir)/vala-1.0/vala valainclude_HEADERS = \ vala.h \ - valaaddressofexpression.h \ - valaarray.h \ - valaarraycreationexpression.h \ - valaarraylengthfield.h \ - valaarraymovemethod.h \ - valaarrayresizemethod.h \ - valaassignment.h \ - valaattribute.h \ - valaattributeprocessor.h \ - valabaseaccess.h \ - valabinaryexpression.h \ - valabindingprovider.h \ - valablock.h \ - valabooleanliteral.h \ - valabreakstatement.h \ - valacallback.h \ - valacastexpression.h \ - valacatchclause.h \ - valacharacterliteral.h \ - valaclass.h \ - valacodebinding.h \ - valacodecontext.h \ - valacodegenerator.h \ - valacodenode.h \ - valacodevisitor.h \ - valaconditionalexpression.h \ - valaconstant.h \ - valaconstructor.h \ - valacontinuestatement.h \ - valacreationmethod.h \ - valadatatype.h \ - valadeclarationstatement.h \ - valadestructor.h \ - valadostatement.h \ - valaelementaccess.h \ - valaemptystatement.h \ - valaenum.h \ - valaenumvalue.h \ - valaexpression.h \ - valaexpressionstatement.h \ - valafield.h \ - valaforeachstatement.h \ - valaformalparameter.h \ - valaforstatement.h \ - valaifstatement.h \ - valainitializerlist.h \ - valainstancecast.h \ - valaintegerliteral.h \ - valainterface.h \ - valainterfacewriter.h \ - valainvocationexpression.h \ - valainvokable.h \ - valalambdaexpression.h \ - valaliteral.h \ - valaliteralexpression.h \ - valalocalvariabledeclaration.h \ - valalockable.h \ - valalockstatement.h \ - valamember.h \ - valamemberaccess.h \ - valamemberinitializer.h \ - valamemorymanager.h \ - valamethod.h \ - valanamedargument.h \ - valanamespace.h \ - valanamespacereference.h \ - valanullliteral.h \ - valaobjectcreationexpression.h \ - valaparenthesizedexpression.h \ - valaparser.h \ - valapointer.h \ - valapointerindirection.h \ - valapostfixexpression.h \ - valapropertyaccessor.h \ - valaproperty.h \ - valarealliteral.h \ - valareferencetransferexpression.h \ - valareport.h \ - valareturnstatement.h \ - valascope.h \ - valasemanticanalyzer.h \ - valasignal.h \ - valasizeofexpression.h \ - valasourcefile.h \ - valasourcefilecycle.h \ - valasourcereference.h \ - valastatement.h \ - valastringliteral.h \ - valastruct.h \ - valaswitchlabel.h \ - valaswitchsection.h \ - valaswitchstatement.h \ - valasymbol.h \ - valasymbolresolver.h \ - valathrowstatement.h \ - valatrystatement.h \ - valatypecheck.h \ - valatypeofexpression.h \ - valatypeparameter.h \ - valatypereference.h \ - valaunaryexpression.h \ - valavariabledeclarator.h \ - valawhilestatement.h \ + $(libvalacore_la_VALASOURCES:.vala=.h) \ $(NULL) -vala.vapi vala.vala.stamp: $(filter %.vala,$(libvalacore_la_SOURCES)) +vala.vapi vala.vala.stamp: $(libvalacore_la_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --basedir $(top_srcdir) --library vala $^ touch $@ diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am index e2477d9..2e7ce4e 100644 --- a/vapigen/Makefile.am +++ b/vapigen/Makefile.am @@ -17,28 +17,32 @@ bin_PROGRAMS = \ BUILT_SOURCES = vapigen.vala.stamp vapicheck.vala.stamp -vapigen_SOURCES = \ - vapigen.vala.stamp \ - valagidlparser.c \ - valagidlparser.h \ +vapigen_VALASOURCES = \ valagidlparser.vala \ - valavapigen.c \ - valavapigen.h \ valavapigen.vala \ $(NULL) +vapigen_SOURCES = \ + vapigen.vala.stamp \ + $(vapigen_VALASOURCES:.vala=.c) \ + $(vapigen_VALASOURCES:.vala=.h) \ + $(NULL) + +vapicheck_VALASOURCES = \ + valavapicheck.vala \ + $(NULL) + vapicheck_SOURCES = \ vapicheck.vala.stamp \ - valavapicheck.c \ - valavapicheck.h \ - valavapicheck.vala \ + $(vapicheck_VALASOURCES:.vala=.c) \ + $(vapicheck_VALASOURCES:.vala=.h) \ $(NULL) -vapigen.vala.stamp: $(filter %.vala,$(vapigen_SOURCES)) +vapigen.vala.stamp: $(vapigen_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^ touch $@ -vapicheck.vala.stamp: $(filter %.vala,$(vapicheck_SOURCES)) +vapicheck.vala.stamp: $(vapicheck_VALASOURCES) $(VALAC) --vapidir $(srcdir)/../vapi --vapidir ../gee --pkg gee --vapidir ../ccode --pkg ccode --vapidir ../vala --pkg vala --vapidir ../gobject-introspection --pkg gidl --pkg config --basedir $(top_srcdir) $^ touch $@