post-merge autotools fixup
This commit is contained in:
Christian Thaeter
parent
adba17472e
commit
d6a18ed9a7
3 changed files with 77 additions and 83 deletions
|
|
@ -42,7 +42,6 @@ liblumiprocasset_la_CXXFLAGS = $(AM_CXXFLAGS) $(LUMIERA_PROC_CFLAGS) -Wall -Wext
|
|||
liblumiprocasset_la_SOURCES = \
|
||||
$(liblumiprocasset_la_srcdir)/codec.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/compoundmedia.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/dataset.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/effect.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/preview.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/unknown.cpp \
|
||||
|
|
@ -54,7 +53,8 @@ liblumiprocasset_la_SOURCES = \
|
|||
$(liblumiprocasset_la_srcdir)/proc.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/procpatt.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/struct.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/track.cpp
|
||||
$(liblumiprocasset_la_srcdir)/sequence.cpp \
|
||||
$(liblumiprocasset_la_srcdir)/timeline.cpp
|
||||
|
||||
|
||||
|
||||
|
|
@ -164,7 +164,6 @@ liblumiprocmobjectsession_la_SOURCES = \
|
|||
$(liblumiprocmobjectsession_la_srcdir)/plug.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/session-impl.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/sess-manager-impl.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/edl.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/session.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/track.cpp \
|
||||
$(liblumiprocmobjectsession_la_srcdir)/fixture.cpp \
|
||||
|
|
@ -183,82 +182,81 @@ liblumiprocmobjectsession_la_SOURCES = \
|
|||
|
||||
|
||||
|
||||
noinst_HEADERS += \
|
||||
$(liblumiproc_la_srcdir)/asset/category.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/clip.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/codec.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/compoundmedia.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/dataset.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/effect.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/preview.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/db.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/buildinstruct.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/media.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/meta.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/pipe.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/proc.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/procpatt.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/struct.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/structfactoryimpl.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/track.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/unknown.hpp \
|
||||
$(liblumiproc_la_srcdir)/controllerfacade.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/mask.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/pluginadapter.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/procnode.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/projector.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/renderengine.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/source.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/trafo.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/rendergraph.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/assembler.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/buildertool.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/conmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/segmentationtool.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/toolfactory.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builderfacade.hpp \
|
||||
$(liblumiproc_la_srcdir)/control/pathmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/play/tick-service.hpp \
|
||||
$(liblumiproc_la_srcdir)/play/dummy-image-generator.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/interpolator.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/parameter.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/paramprovider.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/abstractmo.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/allocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/auto.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/compoundclip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/effect.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/fixedlocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/label.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/meta.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/relativelocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/simpleclip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/mobjectfactory.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/segment.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/segmentation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/track.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/wish.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/clip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/constraint.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/defsmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/edl.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/fixture.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/locatingpin.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/plug.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/defsregistry.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/placement-index.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/query-resolver.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/placement-index-query-resolver.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/session-service-fetch.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/root.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/scope.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/scope-path.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/explicitplacement.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/mobject.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/placement.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset.hpp \
|
||||
$(liblumiproc_la_srcdir)/assetmanager.hpp \
|
||||
noinst_HEADERS += \
|
||||
$(liblumiproc_la_srcdir)/asset/category.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/clip.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/codec.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/compoundmedia.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/dataset.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/effect.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/preview.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/db.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/buildinstruct.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/media.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/meta.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/pipe.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/proc.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/procpatt.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/struct.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/sequence.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/timeline.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset/unknown.hpp \
|
||||
$(liblumiproc_la_srcdir)/controllerfacade.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/mask.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/pluginadapter.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/procnode.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/projector.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/renderengine.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/source.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/trafo.hpp \
|
||||
$(liblumiproc_la_srcdir)/engine/rendergraph.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/assembler.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/buildertool.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/conmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/segmentationtool.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builder/toolfactory.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/builderfacade.hpp \
|
||||
$(liblumiproc_la_srcdir)/control/pathmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/play/tick-service.hpp \
|
||||
$(liblumiproc_la_srcdir)/play/dummy-image-generator.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/interpolator.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/parameter.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/paramprovider.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/abstractmo.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/allocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/auto.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/compoundclip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/effect.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/fixedlocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/label.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/meta.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/relativelocation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/simpleclip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/mobjectfactory.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/segment.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/segmentation.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/track.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/wish.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/clip.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/constraint.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/defsmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/fixture.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/locatingpin.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/plug.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/defsregistry.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/placement-index.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/query-resolver.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/placement-index-query-resolver.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/session-service-fetch.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/root.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/scope.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session/scope-path.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/explicitplacement.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/mobject.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/placement.hpp \
|
||||
$(liblumiproc_la_srcdir)/mobject/session.hpp \
|
||||
$(liblumiproc_la_srcdir)/asset.hpp \
|
||||
$(liblumiproc_la_srcdir)/assetmanager.hpp \
|
||||
$(liblumiproc_la_srcdir)/facade.cpp
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -36,13 +36,11 @@ test_components_LDADD = \
|
|||
test_components_SOURCES = \
|
||||
$(testcomponents_srcdir)/backend/mediaaccessmock.cpp \
|
||||
$(testcomponents_srcdir)/backend/mediaaccessmocktest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/assetcategorytest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/compoundmediatest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/deleteassettest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/identityofassetstest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/mediastructurequerytest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/basicpipetest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/createassettest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/dependent-assets-test.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/makecliptest.cpp \
|
||||
$(testcomponents_srcdir)/proc/asset/orderingofassetstest.cpp \
|
||||
|
|
@ -84,7 +82,6 @@ test_components_SOURCES = \
|
|||
$(testcomponents_srcdir)/proc/mobject/session/defsmanagerimpltest.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/defsmanagertest.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/defsregistryimpltest.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/sessionstructuretest.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/scope-query-test.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/placement-index-query-test.cpp \
|
||||
$(testcomponents_srcdir)/proc/mobject/session/query-focus-stack-test.cpp \
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ test_lib_SOURCES = \
|
|||
$(testlib_srcdir)/meta/config-flags-test.cpp \
|
||||
$(testlib_srcdir)/meta/duck-detector-test.cpp \
|
||||
$(testlib_srcdir)/meta/iterable-classification-test.cpp \
|
||||
$(testlib_srcdir)/query/queryutilstest.cpp \
|
||||
$(testlib_srcdir)/removefromsettest.cpp \
|
||||
$(testlib_srcdir)/sanitised-identifier-test.cpp \
|
||||
$(testlib_srcdir)/opaque-unchecked-buffer-test.cpp \
|
||||
|
|
|
|||
Loading…
Reference in a new issue