From 0cba75a06a198869bc00e25f9c43f1b9f1e511e1 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 25 Aug 2021 17:28:40 +0800 Subject: [PATCH] build: Split out source listings This is done so that we can share the source listings with other Makefile-based build systems, such as NMake. --- ccode/Makefile.am | 59 +------------ ccode/Makefile.sources | 58 +++++++++++++ codegen/Makefile.am | 35 +------- codegen/Makefile.sources | 34 ++++++++ compiler/Makefile.am | 5 +- compiler/Makefile.sources | 4 + gee/Makefile.am | 19 +---- gee/Makefile.sources | 18 ++++ vala/Makefile.am | 170 +------------------------------------- vala/Makefile.sources | 169 +++++++++++++++++++++++++++++++++++++ vapigen/Makefile.am | 10 +-- vapigen/Makefile.sources | 9 ++ 12 files changed, 298 insertions(+), 292 deletions(-) create mode 100644 ccode/Makefile.sources create mode 100644 codegen/Makefile.sources create mode 100644 compiler/Makefile.sources create mode 100644 gee/Makefile.sources create mode 100644 vala/Makefile.sources create mode 100644 vapigen/Makefile.sources diff --git a/ccode/Makefile.am b/ccode/Makefile.am index 9ba660760..7a968cfc4 100644 --- a/ccode/Makefile.am +++ b/ccode/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -16,64 +17,6 @@ noinst_LTLIBRARIES = \ libvalaccode.la \ $(NULL) -libvalaccode_la_VALASOURCES = \ - valaccode.vala \ - valaccodeassignment.vala \ - valaccodebinaryexpression.vala \ - valaccodeblock.vala \ - valaccodebreakstatement.vala \ - valaccodecasestatement.vala \ - valaccodecastexpression.vala \ - valaccodecommaexpression.vala \ - valaccodecomment.vala \ - valaccodeconditionalexpression.vala \ - valaccodeconstant.vala \ - valaccodecontinuestatement.vala \ - valaccodedeclaration.vala \ - valaccodedeclarator.vala \ - valaccodedefine.vala \ - valaccodedostatement.vala \ - valaccodeemptystatement.vala \ - valaccodeenum.vala \ - valaccodeenumvalue.vala \ - valaccodeexpression.vala \ - valaccodeexpressionstatement.vala \ - valaccodefile.vala \ - valaccodeforstatement.vala \ - valaccodefragment.vala \ - valaccodefunction.vala \ - valaccodefunctioncall.vala \ - valaccodefunctiondeclarator.vala \ - valaccodeggnucsection.vala \ - valaccodegotostatement.vala \ - valaccodeidentifier.vala \ - valaccodeifstatement.vala \ - valaccodeincludedirective.vala \ - valaccodeinitializerlist.vala \ - valaccodeinvalidexpression.vala \ - valaccodelabel.vala \ - valaccodelinedirective.vala \ - valaccodeifsection.vala \ - valaccodemacroreplacement.vala \ - valaccodememberaccess.vala \ - valaccodemodifiers.vala \ - valaccodenewline.vala \ - valaccodenode.vala \ - valaccodeoncesection.vala \ - valaccodeparameter.vala \ - valaccodeparenthesizedexpression.vala \ - valaccodereturnstatement.vala \ - valaccodestatement.vala \ - valaccodestruct.vala \ - valaccodeswitchstatement.vala \ - valaccodetypedefinition.vala \ - valaccodeunaryexpression.vala \ - valaccodevariabledeclarator.vala \ - valaccodewhilestatement.vala \ - valaccodewriter.vala \ - valaccodeelementaccess.vala \ - $(NULL) - libvalaccode_la_SOURCES = \ ccode.vala.stamp \ $(libvalaccode_la_VALASOURCES:.vala=.c) \ diff --git a/ccode/Makefile.sources b/ccode/Makefile.sources new file mode 100644 index 000000000..778b29525 --- /dev/null +++ b/ccode/Makefile.sources @@ -0,0 +1,58 @@ +# Source file listing for libvalaccode +libvalaccode_la_VALASOURCES = \ + valaccode.vala \ + valaccodeassignment.vala \ + valaccodebinaryexpression.vala \ + valaccodeblock.vala \ + valaccodebreakstatement.vala \ + valaccodecasestatement.vala \ + valaccodecastexpression.vala \ + valaccodecommaexpression.vala \ + valaccodecomment.vala \ + valaccodeconditionalexpression.vala \ + valaccodeconstant.vala \ + valaccodecontinuestatement.vala \ + valaccodedeclaration.vala \ + valaccodedeclarator.vala \ + valaccodedefine.vala \ + valaccodedostatement.vala \ + valaccodeemptystatement.vala \ + valaccodeenum.vala \ + valaccodeenumvalue.vala \ + valaccodeexpression.vala \ + valaccodeexpressionstatement.vala \ + valaccodefile.vala \ + valaccodeforstatement.vala \ + valaccodefragment.vala \ + valaccodefunction.vala \ + valaccodefunctioncall.vala \ + valaccodefunctiondeclarator.vala \ + valaccodeggnucsection.vala \ + valaccodegotostatement.vala \ + valaccodeidentifier.vala \ + valaccodeifstatement.vala \ + valaccodeincludedirective.vala \ + valaccodeinitializerlist.vala \ + valaccodeinvalidexpression.vala \ + valaccodelabel.vala \ + valaccodelinedirective.vala \ + valaccodeifsection.vala \ + valaccodemacroreplacement.vala \ + valaccodememberaccess.vala \ + valaccodemodifiers.vala \ + valaccodenewline.vala \ + valaccodenode.vala \ + valaccodeoncesection.vala \ + valaccodeparameter.vala \ + valaccodeparenthesizedexpression.vala \ + valaccodereturnstatement.vala \ + valaccodestatement.vala \ + valaccodestruct.vala \ + valaccodeswitchstatement.vala \ + valaccodetypedefinition.vala \ + valaccodeunaryexpression.vala \ + valaccodevariabledeclarator.vala \ + valaccodewhilestatement.vala \ + valaccodewriter.vala \ + valaccodeelementaccess.vala \ + $(NULL) diff --git a/codegen/Makefile.am b/codegen/Makefile.am index c7fc91341..1487ce144 100644 --- a/codegen/Makefile.am +++ b/codegen/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -24,40 +25,6 @@ libvalaccodegen_la_LDFLAGS = \ -avoid-version \ $(NULL) -libvalaccodegen_la_VALASOURCES = \ - valaccode.vala \ - valaccodearraymodule.vala \ - valaccodeassignmentmodule.vala \ - valaccodeattribute.vala \ - valaccodebasemodule.vala \ - valaccodecompiler.vala \ - valaccodecontrolflowmodule.vala \ - valaccodedelegatemodule.vala \ - valaccodememberaccessmodule.vala \ - valaccodemethodcallmodule.vala \ - valaccodemethodmodule.vala \ - valaccodestructmodule.vala \ - valaclassregisterfunction.vala \ - valactype.vala \ - valaenumregisterfunction.vala \ - valagasyncmodule.vala \ - valagdbusclientmodule.vala \ - valagdbusmodule.vala \ - valagdbusservermodule.vala \ - valagerrormodule.vala \ - valagirwriter.vala \ - valaglibvalue.vala \ - valagobjectmodule.vala \ - valagtkmodule.vala \ - valagsignalmodule.vala \ - valagtypemodule.vala \ - valagvaluemodule.vala \ - valagvariantmodule.vala \ - valainterfaceregisterfunction.vala \ - valastructregisterfunction.vala \ - valatyperegisterfunction.vala \ - $(NULL) - libvalaccodegen_la_SOURCES = \ codegen.vala.stamp \ $(libvalaccodegen_la_VALASOURCES:.vala=.c) \ diff --git a/codegen/Makefile.sources b/codegen/Makefile.sources new file mode 100644 index 000000000..ea116888e --- /dev/null +++ b/codegen/Makefile.sources @@ -0,0 +1,34 @@ +# Source file listing for libvalaccodegen +libvalaccodegen_la_VALASOURCES = \ + valaccode.vala \ + valaccodearraymodule.vala \ + valaccodeassignmentmodule.vala \ + valaccodeattribute.vala \ + valaccodebasemodule.vala \ + valaccodecompiler.vala \ + valaccodecontrolflowmodule.vala \ + valaccodedelegatemodule.vala \ + valaccodememberaccessmodule.vala \ + valaccodemethodcallmodule.vala \ + valaccodemethodmodule.vala \ + valaccodestructmodule.vala \ + valaclassregisterfunction.vala \ + valactype.vala \ + valaenumregisterfunction.vala \ + valagasyncmodule.vala \ + valagdbusclientmodule.vala \ + valagdbusmodule.vala \ + valagdbusservermodule.vala \ + valagerrormodule.vala \ + valagirwriter.vala \ + valaglibvalue.vala \ + valagobjectmodule.vala \ + valagtkmodule.vala \ + valagsignalmodule.vala \ + valagtypemodule.vala \ + valagvaluemodule.vala \ + valagvariantmodule.vala \ + valainterfaceregisterfunction.vala \ + valastructregisterfunction.vala \ + valatyperegisterfunction.vala \ + $(NULL) diff --git a/compiler/Makefile.am b/compiler/Makefile.am index 9faaed197..4c25f014d 100644 --- a/compiler/Makefile.am +++ b/compiler/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -19,10 +20,6 @@ bin_PROGRAMS = \ valac \ $(NULL) -valac_VALASOURCES = \ - valacompiler.vala \ - $(NULL) - valac_SOURCES = \ valac.vala.stamp \ $(valac_VALASOURCES:.vala=.c) \ diff --git a/compiler/Makefile.sources b/compiler/Makefile.sources new file mode 100644 index 000000000..6490da81a --- /dev/null +++ b/compiler/Makefile.sources @@ -0,0 +1,4 @@ +# Source file listing for valac +valac_VALASOURCES = \ + valacompiler.vala \ + $(NULL) diff --git a/gee/Makefile.am b/gee/Makefile.am index c3c967db7..794317bbd 100644 --- a/gee/Makefile.am +++ b/gee/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -14,20 +15,6 @@ noinst_LTLIBRARIES = \ libgee.la \ $(NULL) -libgee_la_VALASOURCES = \ - arraylist.vala \ - collection.vala \ - hashmap.vala \ - hashset.vala \ - iterable.vala \ - mapiterator.vala \ - iterator.vala \ - list.vala \ - map.vala \ - set.vala \ - timsort.vala \ - $(NULL) - libgee_la_SOURCES = \ gee.vala.stamp \ $(libgee_la_VALASOURCES:.vala=.c) \ @@ -35,10 +22,6 @@ libgee_la_SOURCES = \ geeincludedir = $(includedir)/vala@PACKAGE_SUFFIX@ -geeinclude_HEADERS = \ - valagee.h \ - $(NULL) - gee.vapi gee.vala.stamp: $(libgee_la_VALASOURCES) $(VALA_V)$(VALAC) \ $(COVERAGE_VALAFLAGS) \ diff --git a/gee/Makefile.sources b/gee/Makefile.sources new file mode 100644 index 000000000..84b780a1b --- /dev/null +++ b/gee/Makefile.sources @@ -0,0 +1,18 @@ +# Source file listing for libgee +libgee_la_VALASOURCES = \ + arraylist.vala \ + collection.vala \ + hashmap.vala \ + hashset.vala \ + iterable.vala \ + mapiterator.vala \ + iterator.vala \ + list.vala \ + map.vala \ + set.vala \ + timsort.vala \ + $(NULL) + +geeinclude_HEADERS = \ + valagee.h \ + $(NULL) diff --git a/vala/Makefile.am b/vala/Makefile.am index 09f3c0672..2e4086694 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -25,171 +26,6 @@ lib_LTLIBRARIES = \ libvala@PACKAGE_SUFFIX@.la \ $(NULL) -libvala_la_VALASOURCES = \ - valaaddressofexpression.vala \ - valaarraycopymethod.vala \ - valaarraycreationexpression.vala \ - valaarraylengthfield.vala \ - valaarraymovemethod.vala \ - valaarrayresizemethod.vala \ - valaarraytype.vala \ - valaassignment.vala \ - valaattribute.vala \ - valabaseaccess.vala \ - valabasicblock.vala \ - valabinaryexpression.vala \ - valablock.vala \ - valabooleanliteral.vala \ - valabooleantype.vala \ - valabreakstatement.vala \ - valacallable.vala \ - valacallableexpression.vala \ - valacallabletype.vala \ - valacastexpression.vala \ - valacatchclause.vala \ - valacharacterliteral.vala \ - valaclass.vala \ - valaclasstype.vala \ - valacodecontext.vala \ - valacodegenerator.vala \ - valacodenode.vala \ - valacodevisitor.vala \ - valacodewriter.vala \ - valacomment.vala \ - valagircomment.vala \ - valaconditionalexpression.vala \ - valaconstant.vala \ - valaconstructor.vala \ - valacontinuestatement.vala \ - valacreationmethod.vala \ - valadatatype.vala \ - valadeclarationstatement.vala \ - valadelegate.vala \ - valadelegatedestroyfield.vala \ - valadelegatetargetfield.vala \ - valadelegatetype.vala \ - valadeletestatement.vala \ - valadestructor.vala \ - valadostatement.vala \ - valadynamicmethod.vala \ - valadynamicproperty.vala \ - valadynamicsignal.vala \ - valaelementaccess.vala \ - valaemptystatement.vala \ - valaenum.vala \ - valaenumvalue.vala \ - valaenumvaluetype.vala \ - valaerrorcode.vala \ - valaerrordomain.vala \ - valaerrortype.vala \ - valaexpression.vala \ - valaexpressionstatement.vala \ - valafield.vala \ - valafieldprototype.vala \ - valafloatingtype.vala \ - valaflowanalyzer.vala \ - valaforeachstatement.vala \ - valaforstatement.vala \ - valagirparser.vala \ - valagenericdestroyfield.vala \ - valagenericdupfield.vala \ - valagenerictype.vala \ - valagenieparser.vala \ - valageniescanner.vala \ - valagenietokentype.vala \ - valaifstatement.vala \ - valainitializerlist.vala \ - valaintegerliteral.vala \ - valaintegertype.vala \ - valainterface.vala \ - valainterfacetype.vala \ - valainvalidexpression.vala \ - valainvalidtype.vala \ - valalambdaexpression.vala \ - valaliteral.vala \ - valalocalvariable.vala \ - valalockable.vala \ - valalockstatement.vala \ - valaloop.vala \ - valaloopstatement.vala \ - valamarkupreader.vala \ - valamemberaccess.vala \ - valamemberinitializer.vala \ - valamethod.vala \ - valamethodcall.vala \ - valamethodtype.vala \ - valanamedargument.vala \ - valanamespace.vala \ - valanullliteral.vala \ - valanulltype.vala \ - valaobjectcreationexpression.vala \ - valaobjecttype.vala \ - valaobjecttypesymbol.vala \ - valaparameter.vala \ - valaparser.vala \ - valaphifunction.vala \ - valapointerindirection.vala \ - valapointertype.vala \ - valapostfixexpression.vala \ - valaprofile.vala \ - valapropertyaccessor.vala \ - valaproperty.vala \ - valapropertyprototype.vala \ - valarealliteral.vala \ - valareferencetransferexpression.vala \ - valareferencetype.vala \ - valaregexliteral.vala \ - valareport.vala \ - valareturnstatement.vala \ - valascanner.vala \ - valascope.vala \ - valasemanticanalyzer.vala \ - valasignal.vala \ - valasignaltype.vala \ - valasizeofexpression.vala \ - valasliceexpression.vala \ - valasourcefile.vala \ - valasourcelocation.vala \ - valasourcereference.vala \ - valastatement.vala \ - valastatementlist.vala \ - valastringliteral.vala \ - valastruct.vala \ - valastructvaluetype.vala \ - valasubroutine.vala \ - valaswitchlabel.vala \ - valaswitchsection.vala \ - valaswitchstatement.vala \ - valasymbol.vala \ - valasymbolresolver.vala \ - valatargetvalue.vala \ - valatemplate.vala \ - valathrowstatement.vala \ - valatokentype.vala \ - valatraversevisitor.vala \ - valatrystatement.vala \ - valatuple.vala \ - valatypecheck.vala \ - valatypeofexpression.vala \ - valatypeparameter.vala \ - valatypesymbol.vala \ - valaunaryexpression.vala \ - valaunlockstatement.vala \ - valaunresolvedsymbol.vala \ - valaunresolvedtype.vala \ - valausedattr.vala \ - valausingdirective.vala \ - valavaluetype.vala \ - valavariable.vala \ - valavartype.vala \ - valaversion.vala \ - valaversionattribute.vala \ - valavoidtype.vala \ - valawhilestatement.vala \ - valawithstatement.vala \ - valayieldstatement.vala \ - $(NULL) - libvala@PACKAGE_SUFFIX@_la_SOURCES = \ vala.vala.stamp \ $(libvala_la_VALASOURCES:.vala=.c) \ @@ -197,10 +33,6 @@ libvala@PACKAGE_SUFFIX@_la_SOURCES = \ valaincludedir = $(includedir)/vala@PACKAGE_SUFFIX@ -valainclude_HEADERS = \ - vala.h \ - $(NULL) - vala.vapi vala.vala.stamp: $(libvala_la_VALASOURCES) $(VALA_V)$(VALAC) \ $(COVERAGE_VALAFLAGS) \ diff --git a/vala/Makefile.sources b/vala/Makefile.sources new file mode 100644 index 000000000..7ef3700da --- /dev/null +++ b/vala/Makefile.sources @@ -0,0 +1,169 @@ +# Source file listing for libvala +libvala_la_VALASOURCES = \ + valaaddressofexpression.vala \ + valaarraycopymethod.vala \ + valaarraycreationexpression.vala \ + valaarraylengthfield.vala \ + valaarraymovemethod.vala \ + valaarrayresizemethod.vala \ + valaarraytype.vala \ + valaassignment.vala \ + valaattribute.vala \ + valabaseaccess.vala \ + valabasicblock.vala \ + valabinaryexpression.vala \ + valablock.vala \ + valabooleanliteral.vala \ + valabooleantype.vala \ + valabreakstatement.vala \ + valacallable.vala \ + valacallableexpression.vala \ + valacallabletype.vala \ + valacastexpression.vala \ + valacatchclause.vala \ + valacharacterliteral.vala \ + valaclass.vala \ + valaclasstype.vala \ + valacodecontext.vala \ + valacodegenerator.vala \ + valacodenode.vala \ + valacodevisitor.vala \ + valacodewriter.vala \ + valacomment.vala \ + valagircomment.vala \ + valaconditionalexpression.vala \ + valaconstant.vala \ + valaconstructor.vala \ + valacontinuestatement.vala \ + valacreationmethod.vala \ + valadatatype.vala \ + valadeclarationstatement.vala \ + valadelegate.vala \ + valadelegatedestroyfield.vala \ + valadelegatetargetfield.vala \ + valadelegatetype.vala \ + valadeletestatement.vala \ + valadestructor.vala \ + valadostatement.vala \ + valadynamicmethod.vala \ + valadynamicproperty.vala \ + valadynamicsignal.vala \ + valaelementaccess.vala \ + valaemptystatement.vala \ + valaenum.vala \ + valaenumvalue.vala \ + valaenumvaluetype.vala \ + valaerrorcode.vala \ + valaerrordomain.vala \ + valaerrortype.vala \ + valaexpression.vala \ + valaexpressionstatement.vala \ + valafield.vala \ + valafieldprototype.vala \ + valafloatingtype.vala \ + valaflowanalyzer.vala \ + valaforeachstatement.vala \ + valaforstatement.vala \ + valagirparser.vala \ + valagenericdestroyfield.vala \ + valagenericdupfield.vala \ + valagenerictype.vala \ + valagenieparser.vala \ + valageniescanner.vala \ + valagenietokentype.vala \ + valaifstatement.vala \ + valainitializerlist.vala \ + valaintegerliteral.vala \ + valaintegertype.vala \ + valainterface.vala \ + valainterfacetype.vala \ + valainvalidexpression.vala \ + valainvalidtype.vala \ + valalambdaexpression.vala \ + valaliteral.vala \ + valalocalvariable.vala \ + valalockable.vala \ + valalockstatement.vala \ + valaloop.vala \ + valaloopstatement.vala \ + valamarkupreader.vala \ + valamemberaccess.vala \ + valamemberinitializer.vala \ + valamethod.vala \ + valamethodcall.vala \ + valamethodtype.vala \ + valanamedargument.vala \ + valanamespace.vala \ + valanullliteral.vala \ + valanulltype.vala \ + valaobjectcreationexpression.vala \ + valaobjecttype.vala \ + valaobjecttypesymbol.vala \ + valaparameter.vala \ + valaparser.vala \ + valaphifunction.vala \ + valapointerindirection.vala \ + valapointertype.vala \ + valapostfixexpression.vala \ + valaprofile.vala \ + valapropertyaccessor.vala \ + valaproperty.vala \ + valapropertyprototype.vala \ + valarealliteral.vala \ + valareferencetransferexpression.vala \ + valareferencetype.vala \ + valaregexliteral.vala \ + valareport.vala \ + valareturnstatement.vala \ + valascanner.vala \ + valascope.vala \ + valasemanticanalyzer.vala \ + valasignal.vala \ + valasignaltype.vala \ + valasizeofexpression.vala \ + valasliceexpression.vala \ + valasourcefile.vala \ + valasourcelocation.vala \ + valasourcereference.vala \ + valastatement.vala \ + valastatementlist.vala \ + valastringliteral.vala \ + valastruct.vala \ + valastructvaluetype.vala \ + valasubroutine.vala \ + valaswitchlabel.vala \ + valaswitchsection.vala \ + valaswitchstatement.vala \ + valasymbol.vala \ + valasymbolresolver.vala \ + valatargetvalue.vala \ + valatemplate.vala \ + valathrowstatement.vala \ + valatokentype.vala \ + valatraversevisitor.vala \ + valatrystatement.vala \ + valatuple.vala \ + valatypecheck.vala \ + valatypeofexpression.vala \ + valatypeparameter.vala \ + valatypesymbol.vala \ + valaunaryexpression.vala \ + valaunlockstatement.vala \ + valaunresolvedsymbol.vala \ + valaunresolvedtype.vala \ + valausedattr.vala \ + valausingdirective.vala \ + valavaluetype.vala \ + valavariable.vala \ + valavartype.vala \ + valaversion.vala \ + valaversionattribute.vala \ + valavoidtype.vala \ + valawhilestatement.vala \ + valawithstatement.vala \ + valayieldstatement.vala \ + $(NULL) + +valainclude_HEADERS = \ + vala.h \ + $(NULL) diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am index cdeab3ffd..4e6747970 100644 --- a/vapigen/Makefile.am +++ b/vapigen/Makefile.am @@ -1,4 +1,5 @@ include $(top_srcdir)/Makefile.common +include Makefile.sources NULL = @@ -26,20 +27,11 @@ noinst_PROGRAMS = \ BUILT_SOURCES = vapigen.vala.stamp vapicheck.vala.stamp -vapigen_VALASOURCES = \ - valagidlparser.vala \ - valavapigen.vala \ - $(NULL) - vapigen_SOURCES = \ vapigen.vala.stamp \ $(vapigen_VALASOURCES:.vala=.c) \ $(NULL) -vapicheck_VALASOURCES = \ - valavapicheck.vala \ - $(NULL) - vapicheck_SOURCES = \ vapicheck.vala.stamp \ $(vapicheck_VALASOURCES:.vala=.c) \ diff --git a/vapigen/Makefile.sources b/vapigen/Makefile.sources new file mode 100644 index 000000000..236bc0259 --- /dev/null +++ b/vapigen/Makefile.sources @@ -0,0 +1,9 @@ +# Source file listing for vapigen/vapicheck +vapigen_VALASOURCES = \ + valagidlparser.vala \ + valavapigen.vala \ + $(NULL) + +vapicheck_VALASOURCES = \ + valavapicheck.vala \ + $(NULL) \ No newline at end of file -- 2.47.2