diff options
author | Emil Velikov | 2014-09-07 09:31:00 -0500 |
---|---|---|
committer | Emil Velikov | 2014-09-28 11:09:33 -0500 |
commit | 98ec08d836d21a516f7646a10e0e2ae4501182f1 (patch) | |
tree | 95e219f33aa846b89d87f17dbda5b87f1b9bb850 | |
parent | 666788a6062de62aa0b3560760fbb0903167a319 (diff) | |
download | external-libgbm-98ec08d836d21a516f7646a10e0e2ae4501182f1.tar.gz external-libgbm-98ec08d836d21a516f7646a10e0e2ae4501182f1.tar.xz external-libgbm-98ec08d836d21a516f7646a10e0e2ae4501182f1.zip |
automake: remove obsolete makefiles
Rather than having two extra makefiles in order to ship ~10 headers
just fold its 5 lines of code into the top one makefile.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-rw-r--r-- | Android.mk | 8 | ||||
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | Makefile.sources | 19 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | include/Makefile.am | 1 | ||||
-rw-r--r-- | include/drm/Makefile.am | 32 | ||||
-rw-r--r-- | include/drm/Makefile.sources | 18 |
7 files changed, 31 insertions, 59 deletions
@@ -26,10 +26,8 @@ include $(CLEAR_VARS) | |||
26 | 26 | ||
27 | LIBDRM_TOP := $(LOCAL_PATH) | 27 | LIBDRM_TOP := $(LOCAL_PATH) |
28 | 28 | ||
29 | # Import variables LIBDRM_FILES, LIBDRM_H_FILES | 29 | # Import variables LIBDRM_{,H_,INCLUDE_H_,INCLUDE_VMWGFX_H_}FILES |
30 | include $(LOCAL_PATH)/Makefile.sources | 30 | include $(LOCAL_PATH)/Makefile.sources |
31 | # Import variables LIBDRM_INCLUDE_H_FILES, LIBDRM_INCLUDE_VMWGFX_H_FILES | ||
32 | include $(LOCAL_PATH)/include/drm/Makefile.sources | ||
33 | 31 | ||
34 | LOCAL_MODULE := libdrm | 32 | LOCAL_MODULE := libdrm |
35 | LOCAL_MODULE_TAGS := optional | 33 | LOCAL_MODULE_TAGS := optional |
@@ -47,8 +45,8 @@ LOCAL_CFLAGS := \ | |||
47 | 45 | ||
48 | LOCAL_COPY_HEADERS := \ | 46 | LOCAL_COPY_HEADERS := \ |
49 | $(LIBDRM_H_FILES) \ | 47 | $(LIBDRM_H_FILES) \ |
50 | $(addprefix include/drm/,$(LIBDRM_INCLUDE_H_FILES)) \ | 48 | $(LIBDRM_INCLUDE_H_FILES) \ |
51 | $(addprefix include/drm/,$(LIBDRM_INCLUDE_VMWGFX_H_FILES)) | 49 | $(LIBDRM_INCLUDE_VMWGFX_H_FILES) |
52 | 50 | ||
53 | LOCAL_COPY_HEADERS_TO := libdrm | 51 | LOCAL_COPY_HEADERS_TO := libdrm |
54 | include $(BUILD_SHARED_LIBRARY) | 52 | include $(BUILD_SHARED_LIBRARY) |
diff --git a/Makefile.am b/Makefile.am index fab2a9a6..083861f0 100644 --- a/Makefile.am +++ b/Makefile.am | |||
@@ -53,7 +53,7 @@ if HAVE_FREEDRENO | |||
53 | FREEDRENO_SUBDIR = freedreno | 53 | FREEDRENO_SUBDIR = freedreno |
54 | endif | 54 | endif |
55 | 55 | ||
56 | SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests include man | 56 | SUBDIRS = . $(LIBKMS_SUBDIR) $(INTEL_SUBDIR) $(NOUVEAU_SUBDIR) $(RADEON_SUBDIR) $(OMAP_SUBDIR) $(EXYNOS_SUBDIR) $(FREEDRENO_SUBDIR) tests man |
57 | 57 | ||
58 | libdrm_la_LTLIBRARIES = libdrm.la | 58 | libdrm_la_LTLIBRARIES = libdrm.la |
59 | libdrm_ladir = $(libdir) | 59 | libdrm_ladir = $(libdir) |
@@ -71,6 +71,14 @@ libdrminclude_HEADERS = $(LIBDRM_H_FILES) | |||
71 | 71 | ||
72 | EXTRA_DIST = libdrm.pc.in include/drm/* | 72 | EXTRA_DIST = libdrm.pc.in include/drm/* |
73 | 73 | ||
74 | klibdrmincludedir = ${includedir}/libdrm | ||
75 | klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) | ||
76 | |||
77 | if HAVE_VMWGFX | ||
78 | klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES) | ||
79 | endif | ||
80 | |||
81 | |||
74 | copy-headers : | 82 | copy-headers : |
75 | cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include | 83 | cp -r $(kernel_source)/usr/include/drm $(top_srcdir)/include |
76 | 84 | ||
diff --git a/Makefile.sources b/Makefile.sources index d078ca9c..d86fb2ae 100644 --- a/Makefile.sources +++ b/Makefile.sources | |||
@@ -11,3 +11,22 @@ LIBDRM_FILES := \ | |||
11 | LIBDRM_H_FILES := \ | 11 | LIBDRM_H_FILES := \ |
12 | xf86drm.h \ | 12 | xf86drm.h \ |
13 | xf86drmMode.h | 13 | xf86drmMode.h |
14 | |||
15 | LIBDRM_INCLUDE_H_FILES := \ | ||
16 | include/drm/drm.h \ | ||
17 | include/drm/drm_fourcc.h \ | ||
18 | include/drm/drm_mode.h \ | ||
19 | include/drm/drm_sarea.h \ | ||
20 | include/drm/i915_drm.h \ | ||
21 | include/drm/mach64_drm.h \ | ||
22 | include/drm/mga_drm.h \ | ||
23 | include/drm/nouveau_drm.h \ | ||
24 | include/drm/qxl_drm.h \ | ||
25 | include/drm/r128_drm.h \ | ||
26 | include/drm/radeon_drm.h \ | ||
27 | include/drm/savage_drm.h \ | ||
28 | include/drm/sis_drm.h \ | ||
29 | include/drm/via_drm.h | ||
30 | |||
31 | LIBDRM_INCLUDE_VMWGFX_H_FILES := \ | ||
32 | include/drm/vmwgfx_drm.h | ||
diff --git a/configure.ac b/configure.ac index bb0559a1..16625a5e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -410,8 +410,6 @@ AC_CONFIG_FILES([ | |||
410 | tests/radeon/Makefile | 410 | tests/radeon/Makefile |
411 | tests/vbltest/Makefile | 411 | tests/vbltest/Makefile |
412 | tests/exynos/Makefile | 412 | tests/exynos/Makefile |
413 | include/Makefile | ||
414 | include/drm/Makefile | ||
415 | man/Makefile | 413 | man/Makefile |
416 | libdrm.pc]) | 414 | libdrm.pc]) |
417 | AC_OUTPUT | 415 | AC_OUTPUT |
diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 55ea5066..00000000 --- a/include/Makefile.am +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | SUBDIRS = drm | ||
diff --git a/include/drm/Makefile.am b/include/drm/Makefile.am deleted file mode 100644 index 7a246aee..00000000 --- a/include/drm/Makefile.am +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | # Copyright 2005 Adam Jackson. | ||
2 | # | ||
3 | # Permission is hereby granted, free of charge, to any person obtaining a | ||
4 | # copy of this software and associated documentation files (the "Software"), | ||
5 | # to deal in the Software without restriction, including without limitation | ||
6 | # on the rights to use, copy, modify, merge, publish, distribute, sub | ||
7 | # license, and/or sell copies of the Software, and to permit persons to whom | ||
8 | # the Software is furnished to do so, subject to the following conditions: | ||
9 | # | ||
10 | # The above copyright notice and this permission notice (including the next | ||
11 | # paragraph) shall be included in all copies or substantial portions of the | ||
12 | # Software. | ||
13 | # | ||
14 | # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | # FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL | ||
17 | # ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
18 | # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
19 | # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
20 | |||
21 | # XXX airlied says, nothing besides *_drm.h and drm*.h should be necessary. | ||
22 | # however, r300 and via need their reg headers installed in order to build. | ||
23 | # better solutions are welcome. | ||
24 | |||
25 | include Makefile.sources | ||
26 | |||
27 | klibdrmincludedir = ${includedir}/libdrm | ||
28 | klibdrminclude_HEADERS = $(LIBDRM_INCLUDE_H_FILES) | ||
29 | |||
30 | if HAVE_VMWGFX | ||
31 | klibdrminclude_HEADERS += $(LIBDRM_INCLUDE_VMWGFX_H_FILES) | ||
32 | endif | ||
diff --git a/include/drm/Makefile.sources b/include/drm/Makefile.sources deleted file mode 100644 index 8e1b5854..00000000 --- a/include/drm/Makefile.sources +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | LIBDRM_INCLUDE_H_FILES := \ | ||
2 | drm.h \ | ||
3 | drm_mode.h \ | ||
4 | drm_fourcc.h \ | ||
5 | drm_sarea.h \ | ||
6 | i915_drm.h \ | ||
7 | mga_drm.h \ | ||
8 | nouveau_drm.h \ | ||
9 | r128_drm.h \ | ||
10 | radeon_drm.h \ | ||
11 | savage_drm.h \ | ||
12 | sis_drm.h \ | ||
13 | via_drm.h \ | ||
14 | mach64_drm.h \ | ||
15 | qxl_drm.h | ||
16 | |||
17 | LIBDRM_INCLUDE_VMWGFX_H_FILES := \ | ||
18 | vmwgfx_drm.h | ||