brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autotools: Make install directories paths more consistent

Browse Source 
Install include files in
$prefix/include/mutter-$apiversion/[clutter,cogl,...,meta]/, and
datafiles in /usr/share/mutter-$apiversion/.... We still would conflict
e.g. given that our gettext name is "mutter", and how keybindings are
installed, but it's a step in the right direction.
This commit is contained in:
Jonas Ådahl 2018-07-17 12:39:57 +02:00
parent 32f3bb02e1
commit d48d56f831
14 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -1,3 +1,5 @@
pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
SUBDIRS = cogl clutter data src po doc SUBDIRS = cogl clutter data src po doc

4
clutter/clutter/Makefile.am
View File

@ -32,7 +32,7 @@ AM_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
INTROSPECTION_GIRS = INTROSPECTION_GIRS =
# the base include path for headers # the base include path for headers
clutter_base_includedir = $(includedir)/mutter/clutter-$(LIBMUTTER_API_VERSION) clutter_base_includedir = $(includedir)/mutter-$(LIBMUTTER_API_VERSION)/clutter
clutter_includedir = $(clutter_base_includedir)/clutter clutter_includedir = $(clutter_base_includedir)/clutter
clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated clutter_deprecateddir = $(clutter_base_includedir)/clutter/deprecated
@ -567,7 +567,7 @@ nodist_clutter_include_HEADERS = clutter-config.h $(built_source_h)
clutter_deprecated_HEADERS = $(deprecated_h) clutter_deprecated_HEADERS = $(deprecated_h)
mutterlibdir = $(libdir)/mutter mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
mutterlib_LTLIBRARIES = libmutter-clutter-@LIBMUTTER_API_VERSION@.la mutterlib_LTLIBRARIES = libmutter-clutter-@LIBMUTTER_API_VERSION@.la
libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LIBADD = \ libmutter_clutter_@LIBMUTTER_API_VERSION@_la_LIBADD = \

8
clutter/clutter/mutter-clutter.pc.in
View File

@ -1,9 +1,9 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/mutter
includedir=@includedir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion}
requires=@CLUTTER_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@CLUTTER_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
requires_private=@CLUTTER_REQUIRES_PRIVATE@ requires_private=@CLUTTER_REQUIRES_PRIVATE@
backends=@CLUTTER_BACKENDS@ backends=@CLUTTER_BACKENDS@
@ -19,6 +19,6 @@ Name: Mutter Clutter
Description: Mutter's Clutter Private Library Description: Mutter's Clutter Private Library
Version: @MUTTER_VERSION@ Version: @MUTTER_VERSION@
Libs: -L${libdir} -lmutter-clutter-${apiversion} Libs: -L${libdir} -lmutter-clutter-${apiversion}
Cflags: -I${includedir}/clutter-${apiversion} Cflags: -I${includedir}/clutter
Requires: ${requires} Requires: ${requires}
Requires.private: ${requires_private} Requires.private: ${requires_private}

4
cogl/cogl-gles2/Makefile.am
View File

@ -4,7 +4,7 @@ NULL =
DISTCLEANFILES = DISTCLEANFILES =
mutterlibdir = $(libdir)/mutter mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
mutterlib_LTLIBRARIES = libmutter-cogl-gles2-@LIBMUTTER_API_VERSION@.la mutterlib_LTLIBRARIES = libmutter-cogl-gles2-@LIBMUTTER_API_VERSION@.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
@ -23,7 +23,7 @@ libmutter_cogl_gles2_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
-export-dynamic \ -export-dynamic \
-export-symbols-regex "^gl*" -export-symbols-regex "^gl*"
coglgles2includedir = $(includedir)/mutter/cogl/cogl-gles2/GLES2 coglgles2includedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@/cogl/cogl-gles2/GLES2
coglgles2include_HEADERS = \ coglgles2include_HEADERS = \
GLES2/gl2.h \ GLES2/gl2.h \
GLES2/gl2ext.h \ GLES2/gl2ext.h \

4
cogl/cogl-gles2/mutter-cogl-gles2.pc.in
View File

@ -1,8 +1,8 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/mutter
includedir=@includedir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
Name: Cogl Name: Cogl

4
cogl/cogl-pango/Makefile.am
View File

@ -22,7 +22,7 @@ source_h_priv = \
cogl-pango-pipeline-cache.h \ cogl-pango-pipeline-cache.h \
$(NULL) $(NULL)
mutterlibdir = $(libdir)/mutter mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
mutterlib_LTLIBRARIES = libmutter-cogl-pango-@LIBMUTTER_API_VERSION@.la mutterlib_LTLIBRARIES = libmutter-cogl-pango-@LIBMUTTER_API_VERSION@.la
libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_priv) libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h) $(source_h_priv)
@ -45,7 +45,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) -I$(top_builddir)
cogl_base_includedir = $(includedir)/mutter cogl_base_includedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@
cogl_pangoheadersdir = $(cogl_base_includedir)/cogl/cogl-pango cogl_pangoheadersdir = $(cogl_base_includedir)/cogl/cogl-pango
cogl_pangoheaders_HEADERS = $(source_h) cogl_pangoheaders_HEADERS = $(source_h)

4
cogl/cogl-pango/mutter-cogl-pango.pc.in
View File

@ -1,8 +1,8 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/mutter
includedir=@includedir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
Name: Cogl Name: Cogl

4
cogl/cogl-path/Makefile.am
View File

@ -64,7 +64,7 @@ glib_enum_c = cogl-path-enum-types.c
glib_enum_headers = $(source_1_x_h) glib_enum_headers = $(source_1_x_h)
include $(top_srcdir)/build/autotools/Makefile.am.enums include $(top_srcdir)/build/autotools/Makefile.am.enums
mutterlibdir = $(libdir)/mutter mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
mutterlib_LTLIBRARIES = libmutter-cogl-path-@LIBMUTTER_API_VERSION@.la mutterlib_LTLIBRARIES = libmutter-cogl-path-@LIBMUTTER_API_VERSION@.la
libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h) libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la_SOURCES = $(source_c) $(source_h)
@ -89,7 +89,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_builddir) -I$(top_builddir)
cogl_base_includedir = $(includedir)/mutter cogl_base_includedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@
cogl_pathheadersdir = $(cogl_base_includedir)/cogl/cogl-path cogl_pathheadersdir = $(cogl_base_includedir)/cogl/cogl-path
cogl_pathheaders_HEADERS = $(source_h) cogl_pathheaders_HEADERS = $(source_h)
nodist_cogl_pathheaders_HEADERS = cogl-path-enum-types.h nodist_cogl_pathheaders_HEADERS = cogl-path-enum-types.h

4
cogl/cogl-path/mutter-cogl-path.pc.in
View File

@ -1,8 +1,8 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/mutter
includedir=@includedir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@ requires=@COGL_PKG_REQUIRES@ mutter-cogl-@LIBMUTTER_API_VERSION@
Name: Cogl Name: Cogl

4
cogl/cogl/Makefile.am
View File

@ -421,7 +421,7 @@ cogl_sources_c += \
winsys/cogl-winsys-egl-private.h winsys/cogl-winsys-egl-private.h
endif endif
mutterlibdir = $(libdir)/mutter mutterlibdir = $(libdir)/mutter-@LIBMUTTER_API_VERSION@
mutterlib_LTLIBRARIES = libmutter-cogl-@LIBMUTTER_API_VERSION@.la mutterlib_LTLIBRARIES = libmutter-cogl-@LIBMUTTER_API_VERSION@.la
libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS) libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LIBADD = $(LIBM) $(COGL_DEP_LIBS) $(COGL_EXTRA_LDFLAGS)
@ -447,7 +447,7 @@ cogl_headers = \
cogl-pango.h \ cogl-pango.h \
$(NULL) $(NULL)
cogl_base_includedir = $(includedir)/mutter cogl_base_includedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@
cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated cogldeprecatedincludedir = $(cogl_base_includedir)/cogl/cogl/deprecated
cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h) $(cogl_deprecated_nonintrospected_h) cogldeprecatedinclude_HEADERS = $(cogl_deprecated_h) $(cogl_deprecated_nonintrospected_h)

4
cogl/cogl/mutter-cogl.pc.in
View File

@ -1,8 +1,8 @@
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
libdir=@libdir@/mutter
includedir=@includedir@/mutter
apiversion=@LIBMUTTER_API_VERSION@ apiversion=@LIBMUTTER_API_VERSION@
libdir=@libdir@/mutter-${apiversion}
includedir=@includedir@/mutter-${apiversion}
requires=@COGL_PKG_REQUIRES@ requires=@COGL_PKG_REQUIRES@
Name: Cogl Name: Cogl

2
configure.ac
View File

@ -42,7 +42,7 @@ AC_SUBST(LIBMUTTER_API_VERSION)
# Make the mutter versions visible to the cogl and clutter subdirs # Make the mutter versions visible to the cogl and clutter subdirs
export LIBMUTTER_API_VERSION MUTTER_VERSION export LIBMUTTER_API_VERSION MUTTER_VERSION
MUTTER_PLUGIN_DIR="$libdir/$PACKAGE/plugins" MUTTER_PLUGIN_DIR="$libdir/mutter-$LIBMUTTER_API_VERSION/plugins"
AC_SUBST(MUTTER_PLUGIN_DIR) AC_SUBST(MUTTER_PLUGIN_DIR)
# Honor aclocal flags # Honor aclocal flags

5
src/Makefile.am
View File

@ -1,6 +1,9 @@
# Flag build for parallelism; see https://savannah.gnu.org/patch/?6905 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
.AUTOPARALLEL: .AUTOPARALLEL:
pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
lib_LTLIBRARIES = libmutter-@LIBMUTTER_API_VERSION@.la lib_LTLIBRARIES = libmutter-@LIBMUTTER_API_VERSION@.la
SUBDIRS=compositor/plugins SUBDIRS=compositor/plugins
@ -586,7 +589,7 @@ libmutterinclude_base_headers = \
$(libmutterinclude_headers) \ $(libmutterinclude_headers) \
$(libmutterinclude_built_headers) $(libmutterinclude_built_headers)
libmutterincludedir = $(includedir)/mutter/meta libmutterincludedir = $(includedir)/mutter-@LIBMUTTER_API_VERSION@/meta
libmutterinclude_HEADERS = \ libmutterinclude_HEADERS = \
$(libmutterinclude_headers) $(libmutterinclude_headers)

4
src/compositor/plugins/Makefile.am
View File

@ -1,5 +1,5 @@
pkgdatadir = $(datadir)/mutter-$(LIBMUTTER_API_VERSION)
pkglibdir = $(MUTTER_PLUGIN_DIR) pkglibdir = $(libdir)/mutter-$(LIBMUTTER_API_VERSION)
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(MUTTER_CFLAGS) \ $(MUTTER_CFLAGS) \