build: Fix distcheck
This commit is contained in:
Emmanuele Bassi
parent
cdd5f6142c
commit
a13b095dc2
|
|
@ -523,19 +523,14 @@ EXTRA_DIST += \
|
|||
$(srcdir)/win32/resources.rc \
|
||||
$(NULL)
|
||||
|
||||
# EGL backend rules
|
||||
egl_source_h = \
|
||||
$(srcdir)/egl/clutter-egl-headers.h \
|
||||
$(srcdir)/egl/clutter-egl.h \
|
||||
$(NULL)
|
||||
|
||||
egl_source_h_priv = $(srcdir)/egl/clutter-backend-eglnative.h
|
||||
egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c
|
||||
egl_source_c_priv =
|
||||
|
||||
egl_tslib_h = $(srcdir)/tslib/clutter-event-tslib.h
|
||||
egl_tslib_c = $(srcdir)/tslib/clutter-event-tslib.c
|
||||
|
||||
if USE_TSLIB
|
||||
backend_source_c_priv += $(egl_tslib_c)
|
||||
backend_source_h_priv += $(egl_tslib_h)
|
||||
endif # SUPPORT_TSLIB
|
||||
|
||||
evdev_c_priv = \
|
||||
$(srcdir)/evdev/clutter-xkb-utils.c \
|
||||
$(srcdir)/evdev/clutter-device-manager-evdev.c \
|
||||
|
|
@ -547,22 +542,17 @@ evdev_h_priv = \
|
|||
$(srcdir)/evdev/clutter-input-device-evdev.h \
|
||||
$(NULL)
|
||||
|
||||
if USE_EVDEV
|
||||
backend_source_c_priv += $(evdev_c_priv)
|
||||
backend_source_h_priv += $(evdev_h_priv)
|
||||
endif # SUPPORT_EVDEV
|
||||
|
||||
cex_source_h_priv = $(srcdir)/cex100/clutter-backend-cex100.h
|
||||
cex_source_c = $(srcdir)/cex100/clutter-backend-cex100.c
|
||||
cex_h = cex100/clutter-cex100.h
|
||||
BUILT_SOURCES += $(cex_h)
|
||||
EXTRA_DIST += $(srcdir)/$(cex_h).in
|
||||
|
||||
if USE_TSLIB
|
||||
egl_source_c_priv += $(egl_tslib_c)
|
||||
egl_source_h_priv += $(egl_tslib_h)
|
||||
endif # SUPPORT_TSLIB
|
||||
|
||||
if USE_EVDEV
|
||||
egl_source_c_priv += $(evdev_c_priv)
|
||||
egl_source_h_priv += $(evdev_h_priv)
|
||||
endif # SUPPORT_EVDEV
|
||||
|
||||
if SUPPORT_CEX100
|
||||
backend_source_h += $(cex_h)
|
||||
backend_source_c += $(cex_source_c)
|
||||
|
|
@ -581,10 +571,18 @@ compat_libs += \
|
|||
$(NULL)
|
||||
endif # SUPPORT_CEX100
|
||||
|
||||
# EGL backend rules
|
||||
egl_source_h = \
|
||||
$(srcdir)/egl/clutter-egl-headers.h \
|
||||
$(srcdir)/egl/clutter-egl.h \
|
||||
$(NULL)
|
||||
|
||||
egl_source_h_priv = $(srcdir)/egl/clutter-backend-eglnative.h
|
||||
egl_source_c = $(srcdir)/egl/clutter-backend-eglnative.c
|
||||
|
||||
if SUPPORT_EGL
|
||||
backend_source_h += $(egl_source_h)
|
||||
backend_source_c += $(egl_source_c)
|
||||
backend_source_h_priv += $(egl_source_h_priv)
|
||||
|
||||
clutteregl_includedir = $(clutter_includedir)/egl
|
||||
clutteregl_include_HEADERS = $(egl_source_h)
|
||||
|
|
|
|||
|
|
@ -145,8 +145,7 @@ clean-wrappers:
|
|||
rm -f wrappers/$$unit$(SHEXT) ; \
|
||||
done \
|
||||
&& rm -f unit-tests \
|
||||
&& rm -f $(top_srcdir)/build/win32/*.bat \
|
||||
&& rm -f *.bat \
|
||||
&& rm -f $(top_builddir)/build/win32/*.bat \
|
||||
&& rm -f stamp-test-conformance
|
||||
|
||||
# NB: BUILT_SOURCES here a misnomer. We aren't building source, just inserting
|
||||
|
|
@ -156,9 +155,7 @@ BUILT_SOURCES = wrappers
|
|||
INCLUDES = \
|
||||
-I$(top_srcdir)/ \
|
||||
-I$(top_srcdir)/clutter \
|
||||
-I$(top_srcdir)/clutter/cogl \
|
||||
-I$(top_builddir)/clutter \
|
||||
-I$(top_builddir)/clutter/cogl
|
||||
-I$(top_builddir)/clutter
|
||||
|
||||
test_conformance_CPPFLAGS = \
|
||||
-DG_DISABLE_SINGLE_INCLUDES \
|
||||
|
|
@ -317,14 +314,15 @@ $(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters: $(top
|
|||
*.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testconformance.vs10.sourcefiles.filters
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin >$@
|
||||
done > testconformance.vs10.sourcefiles.filters
|
||||
$(CPP) -P - < $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin > $@
|
||||
rm -f testconformance.vs10.sourcefiles.filters
|
||||
|
||||
# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
|
||||
DISTCLEANFILES += $(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
DISTCLEANFILES += \
|
||||
$(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
|
||||
# we override the clean-generic target to clean up the wrappers so
|
||||
# we cannot use CLEANFILES
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ clean-wrappers:
|
|||
rm -f $$test_bin$(SHEXT); \
|
||||
done \
|
||||
&& rm -f $(top_builddir)/build/win32/*.bat \
|
||||
&& rm -f *.bat \
|
||||
&& rm -f stamp-test-unit-names \
|
||||
&& rm -f stamp-test-interactive
|
||||
|
||||
.PHONY: wrappers clean-wrappers
|
||||
|
|
@ -176,9 +176,9 @@ $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/b
|
|||
*.c) echo ' <File RelativePath="..\..\..\tests\interactive\'$$F'" />' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testinteractive.sourcefiles
|
||||
done > testinteractive.sourcefiles
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@
|
||||
rm testinteractive.sourcefiles
|
||||
rm -f testinteractive.sourcefiles
|
||||
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
|
||||
for F in $(test_interactive_SOURCES); do \
|
||||
|
|
@ -187,9 +187,9 @@ $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)
|
|||
*.c) echo ' <ClCompile Include="..\..\..\tests\interactive\'$$F'" />' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testinteractive.vs10.sourcefiles
|
||||
done > testinteractive.vs10.sourcefiles
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@
|
||||
rm testinteractive.vs10.sourcefiles
|
||||
rm -f testinteractive.vs10.sourcefiles
|
||||
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
|
||||
for F in $(test_interactive_SOURCES); do \
|
||||
|
|
@ -198,17 +198,20 @@ $(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top
|
|||
*.c) echo ' <ClCompile Include="..\..\..\tests\interactive\'$$F'"><Filter>Sources</Filter></ClCompile>' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testinteractive.vs10.sourcefiles.filters
|
||||
done > testinteractive.vs10.sourcefiles.filters
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin >$@
|
||||
rm testinteractive.vs10.sourcefiles.filters
|
||||
rm -f testinteractive.vs10.sourcefiles.filters
|
||||
|
||||
# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
|
||||
DISTCLEANFILES += $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
||||
DISTCLEANFILES += \
|
||||
$(top_builddir)/build/win32/test-unit-names.h \
|
||||
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
||||
|
||||
EXTRA_DIST += \
|
||||
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
||||
|
||||
clean-local: clean-wrappers
|
||||
|
|
|
|||
Loading…
Reference in New Issue