Drop compat headers

These headers were always internal anyway, drop them now that we've had 2
releases with them marked as deprecated.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

6 files changed, 1 insertions, 19 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 4a6ce03..c98da22 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -23,18 +23,10 @@
 # SOFTWARE.
 #
 
-# compat headers, to be dropped in the future
-compat_headers =  \
-	xorg/gtest/xorg-gtest_environment.h \
-	xorg/gtest/xorg-gtest_process.h \
-	xorg/gtest/xorg-gtest_test.h \
-	xorg/gtest/evemu/xorg-gtest_device.h
-
 nobase_include_HEADERS = \
 	xorg/gtest/xorg-gtest-environment.h \
 	xorg/gtest/xorg-gtest-process.h \
 	xorg/gtest/xorg-gtest-test.h \
 	xorg/gtest/xorg-gtest-xserver.h \
 	xorg/gtest/evemu/xorg-gtest-device.h \
-	xorg/gtest/xorg-gtest.h \
-	$(compat_headers)
+	xorg/gtest/xorg-gtest.h
diff --git a/include/xorg/gtest/evemu/xorg-gtest_device.h b/include/xorg/gtest/evemu/xorg-gtest_device.h
deleted file mode 100644
index 464c90d..0000000
--- a/include/xorg/gtest/evemu/xorg-gtest_device.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This header is deprecated. Include xorg-gtest-device.h instead"
-#include "xorg-gtest-device.h"
diff --git a/include/xorg/gtest/xorg-gtest_device.h b/include/xorg/gtest/xorg-gtest_device.h
deleted file mode 100644
index 464c90d..0000000
--- a/include/xorg/gtest/xorg-gtest_device.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This header is deprecated. Include xorg-gtest-device.h instead"
-#include "xorg-gtest-device.h"
diff --git a/include/xorg/gtest/xorg-gtest_environment.h b/include/xorg/gtest/xorg-gtest_environment.h
deleted file mode 100644
index 50000cd..0000000
--- a/include/xorg/gtest/xorg-gtest_environment.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This header is deprecated. Include xorg-gtest-environment.h instead"
-#include "xorg-gtest-environment.h"
diff --git a/include/xorg/gtest/xorg-gtest_process.h b/include/xorg/gtest/xorg-gtest_process.h
deleted file mode 100644
index 2175a27..0000000
--- a/include/xorg/gtest/xorg-gtest_process.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This header is deprecated. Include xorg-gtest-process.h instead"
-#include "xorg-gtest-process.h"
diff --git a/include/xorg/gtest/xorg-gtest_test.h b/include/xorg/gtest/xorg-gtest_test.h
deleted file mode 100644
index 4c21a36..0000000
--- a/include/xorg/gtest/xorg-gtest_test.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This header is deprecated. Include xorg-gtest-test.h instead"
-#include "xorg-gtest-test.h"