diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-01-24 20:38:01 +0100 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2012-01-26 10:07:11 +0100 |
commit | 8b902056d53e0e14f7d58ac7f95091ab06abc72e (patch) | |
tree | 5910a2c884eb8cecf8d91943bea1874798689cf5 /src/egl | |
parent | dc435ae774b1deed3d00b7c7d33133c08b626737 (diff) |
automake: src/egl/wayland
So we can use the wayland scanner makro, which is way
better than our previous runtime-pkgconfig hack.
Reviewed-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'src/egl')
-rw-r--r-- | src/egl/drivers/dri2/Makefile | 2 | ||||
-rw-r--r-- | src/egl/main/Makefile | 2 | ||||
-rw-r--r-- | src/egl/wayland/.gitignore (renamed from src/egl/wayland/wayland-drm/.gitignore) | 6 | ||||
-rw-r--r-- | src/egl/wayland/Makefile | 30 | ||||
-rw-r--r-- | src/egl/wayland/Makefile.am | 1 | ||||
-rw-r--r-- | src/egl/wayland/wayland-drm/Makefile | 47 | ||||
-rw-r--r-- | src/egl/wayland/wayland-drm/Makefile.am | 15 | ||||
-rw-r--r-- | src/egl/wayland/wayland-egl/Makefile | 71 | ||||
-rw-r--r-- | src/egl/wayland/wayland-egl/Makefile.am | 9 | ||||
-rw-r--r-- | src/egl/wayland/wayland-egl/wayland-egl.pc.in | 14 |
10 files changed, 39 insertions, 158 deletions
diff --git a/src/egl/drivers/dri2/Makefile b/src/egl/drivers/dri2/Makefile index d2b1f4f077a..8ea30967fb5 100644 --- a/src/egl/drivers/dri2/Makefile +++ b/src/egl/drivers/dri2/Makefile @@ -42,7 +42,7 @@ EGL_INCLUDES += -DHAVE_WAYLAND_PLATFORM $(WAYLAND_CFLAGS) \ -I$(TOP)/src/egl/wayland/wayland-egl \ -I$(TOP)/src/egl/wayland/wayland-drm EGL_LIBS += $(WAYLAND_LIBS) \ - $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a + $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a endif include ../Makefile.template diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile index 57fb691ea9d..91d761731fc 100644 --- a/src/egl/main/Makefile +++ b/src/egl/main/Makefile @@ -71,7 +71,7 @@ endif # libs/cflags for display type autodetection ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) -LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a +LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a EGL_LIB_DEPS += $(WAYLAND_LIBS) INCLUDE_DIRS += $(WAYLAND_CFLAGS) endif diff --git a/src/egl/wayland/wayland-drm/.gitignore b/src/egl/wayland/.gitignore index f4ed848476f..407633a1c1d 100644 --- a/src/egl/wayland/wayland-drm/.gitignore +++ b/src/egl/wayland/.gitignore @@ -1,3 +1,9 @@ +.deps/ +.libs/ +Makefile +Makefile.in +libwayland-egl.la +libwayland-drm.la wayland-drm-client-protocol.h wayland-drm-server-protocol.h wayland-drm-protocol.c diff --git a/src/egl/wayland/Makefile b/src/egl/wayland/Makefile deleted file mode 100644 index c38a1302f18..00000000000 --- a/src/egl/wayland/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# src/egl/wayland/Makefile - -TOP = ../../.. -include $(TOP)/configs/current - -SUBDIRS = wayland-drm wayland-egl - -default: subdirs - - -subdirs: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE)) || exit 1 ; \ - fi \ - done - -install: - @for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) install) || exit 1 ; \ - fi \ - done - -clean: - -@for dir in $(SUBDIRS) ; do \ - if [ -d $$dir ] ; then \ - (cd $$dir && $(MAKE) clean) ; \ - fi \ - done diff --git a/src/egl/wayland/Makefile.am b/src/egl/wayland/Makefile.am new file mode 100644 index 00000000000..ca7207c1ce9 --- /dev/null +++ b/src/egl/wayland/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = wayland-drm wayland-egl diff --git a/src/egl/wayland/wayland-drm/Makefile b/src/egl/wayland/wayland-drm/Makefile deleted file mode 100644 index 42222a9872c..00000000000 --- a/src/egl/wayland/wayland-drm/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# src/egl/wayland/wayland-drm/Makefile - -TOP = ../../../.. -include $(TOP)/configs/current - -GEN_SOURCES = wayland-drm-protocol.c - -GEN_HEADERS = wayland-drm-client-protocol.h wayland-drm-server-protocol.h - -wayland_drm_SOURCES = wayland-drm.c $(GEN_SOURCES) -wayland_drm_OBJECTS = $(wayland_drm_SOURCES:.c=.o) - -wayland_drm_INCLUDES = \ - $(WAYLAND_CFLAGS) \ - -I$(TOP)/src/egl/main \ - -I$(TOP)/include - -# Generate protocol sources -prefix=$(shell $(PKG_CONFIG) --variable=prefix wayland-server) -exec_prefx=$(shell $(PKG_CONFIG) --variable=exec_prefix wayland-server) -wayland_protocoldir = $(PWD)/protocol -wayland_scanner=$(exec_prefix)/bin/wayland-scanner - -default: depend libwayland-drm.a $(GEN_SOURCES) $(GEN_HEADERS) - -libwayland-drm.a: $(wayland_drm_OBJECTS) Makefile - $(MKLIB) -o wayland-drm -static $(wayland_drm_OBJECTS) - -depend: - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(wayland_drm_INCLUDES) $(wayland_drm_SOURCES) 2> /dev/null - -clean: - rm -rf libwayland-drm.a $(wayland_drm_OBJECTS) \ - $(GEN_SOURCES) $(GEN_HEADERS) - rm -f depend depend.bak - -install: - @echo -n "" - -$(wayland_drm_OBJECTS): %.o: %.c $(GEN_HEADERS) - $(CC) -c $(wayland_drm_INCLUDES) $(CFLAGS) $< -o $@ - -include $(prefix)/share/aclocal/wayland-scanner.mk - -sinclude depend diff --git a/src/egl/wayland/wayland-drm/Makefile.am b/src/egl/wayland/wayland-drm/Makefile.am new file mode 100644 index 00000000000..cf15edae83d --- /dev/null +++ b/src/egl/wayland/wayland-drm/Makefile.am @@ -0,0 +1,15 @@ +AM_CFLAGS = -I$(top_srcdir)/src/egl/main \ + -I$(top_srcdir)/include \ + $(DEFINES) \ + $(WAYLAND_CFLAGS) + +noinst_LTLIBRARIES = libwayland-drm.la +libwayland_drm_la_SOURCES = wayland-drm.c wayland-drm-protocol.c +noinst_HEADERS = wayland-drm.h + +BUILT_SOURCES = wayland-drm-protocol.c \ + wayland-drm-client-protocol.h \ + wayland-drm-server-protocol.h +CLEANFILES = $(BUILT_SOURCES) + +@wayland_scanner_rules@ diff --git a/src/egl/wayland/wayland-egl/Makefile b/src/egl/wayland/wayland-egl/Makefile deleted file mode 100644 index b9d13dce5d0..00000000000 --- a/src/egl/wayland/wayland-egl/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# src/egl/wayland/wayland-egl/Makefile - -TOP = ../../../.. -include $(TOP)/configs/current - -INCLUDE_DIRS = -I$(TOP)/include \ - -I$(TOP)/include/EGL \ - -I$(TOP)/src/egl/wayland/wayland-drm - - -HEADERS = wayland-egl-priv.h -SOURCES = wayland-egl.c - -OBJECTS = $(SOURCES:.c=.o) - -LOCAL_CFLAGS = $(LIBDRM_CFLAGS) \ - $(WAYLAND_CFLAGS) - -LOCAL_LIBS = - -.c.o: - $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(LOCAL_CFLAGS) $< -o $@ - - -default: depend library - -# wayland-egl Library -library: $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME) - -$(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_NAME): $(OBJECTS) $(LOCAL_LIBS) - $(MKLIB) -o $(WAYLAND_EGL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ - -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ - -L$(TOP)/$(LIB_DIR) $(WAYLAND_EGL_LIB_DEPS) \ - $(OBJECTS) $(LOCAL_LIBS) - -PKG_CONFIG_DIR = $(INSTALL_LIB_DIR)/pkgconfig - -gl_pcedit = sed \ - -e 's,@INSTALL_DIR@,$(INSTALL_DIR),' \ - -e 's,@INSTALL_LIB_DIR@,$(INSTALL_LIB_DIR),' \ - -e 's,@INSTALL_INC_DIR@,$(INSTALL_INC_DIR),' \ - -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ - -e 's,@WAYLAND_EGL_PC_REQ_PRIV@,$(WAYLAND_EGL_PC_REQ_PRIV),' \ - -e 's,@WAYLAND_EGL_PC_LIB_PRIV@,$(WAYLAND_EGL_PC_LIB_PRIV),' \ - -e 's,@WAYLAND_EGL_PC_CFLAGS@,$(WAYLAND_EGL_PC_CFLAGS),' \ - -e 's,@WAYLAND_EGL_LIB@,$(WAYLAND_EGL_LIB),' - -wayland-egl.pc: wayland-egl.pc.in - $(gl_pcedit) $< > $@ - -install: default wayland-egl.pc - $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) - $(MINSTALL) $(TOP)/$(LIB_DIR)/$(WAYLAND_EGL_LIB_GLOB) \ - $(DESTDIR)$(INSTALL_LIB_DIR) - $(INSTALL) -d $(DESTDIR)$(PKG_CONFIG_DIR) - $(INSTALL) -m 644 wayland-egl.pc $(DESTDIR)$(PKG_CONFIG_DIR) - -clean: - -rm -f *.o - -rm -f depend depend.bak - -depend: $(SOURCES) $(HEADERS) - @ echo "running $(MKDEP)" - @ rm -f depend - @ touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \ - $(SOURCES) $(HEADERS) > /dev/null 2>/dev/null - - --include depend -# DO NOT DELETE diff --git a/src/egl/wayland/wayland-egl/Makefile.am b/src/egl/wayland/wayland-egl/Makefile.am new file mode 100644 index 00000000000..a19a5fcde1a --- /dev/null +++ b/src/egl/wayland/wayland-egl/Makefile.am @@ -0,0 +1,9 @@ +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = wayland-egl.pc + +AM_CFLAGS = $(DEFINES) + +lib_LTLIBRARIES = libwayland-egl.la +noinst_HEADERS = wayland-egl-priv.h +libwayland_egl_la_SOURCES = wayland-egl.c +libwayland_egl_la_LDFLAGS = -version-info 1 diff --git a/src/egl/wayland/wayland-egl/wayland-egl.pc.in b/src/egl/wayland/wayland-egl/wayland-egl.pc.in index 3c2067c2a77..f8a8df21741 100644 --- a/src/egl/wayland/wayland-egl/wayland-egl.pc.in +++ b/src/egl/wayland/wayland-egl/wayland-egl.pc.in @@ -1,12 +1,10 @@ -prefix=@INSTALL_DIR@ -exec_prefix=${prefix} -libdir=@INSTALL_LIB_DIR@ -includedir=@INSTALL_INC_DIR@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ Name: wayland-egl Description: Mesa wayland-egl library -Requires.private: @WAYLAND_EGL_PC_REQ_PRIV@ Version: @VERSION@ -Libs: -L${libdir} -l@WAYLAND_EGL_LIB@ -Libs.private: @WAYLAND_EGL_PC_LIB_PRIV@ -Cflags: -I${includedir} @WAYLAND_EGL_PC_CFLAGS@ +Libs: -L${libdir} -lwayland-egl +Cflags: -I${includedir} |