From 4305ce94f40526de8cd92200c1abf5f369bc03b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 14 Apr 2018 21:45:07 +0200 Subject: [PATCH 1/2] Re-add pkg-config support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Give others - e.g qmmp the chance to find projectM Signed-off-by: Andreas Müller --- configure.ac | 1 + src/libprojectM/Makefile.am | 6 +++--- src/libprojectM/libprojectM.pc.in | 14 +++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 96ce9dd75..eb582aa1a 100644 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,7 @@ AC_CONFIG_FILES([ src/libprojectM/Renderer/Makefile src/libprojectM/NativePresetFactory/Makefile src/libprojectM/MilkdropPresetFactory/Makefile + src/libprojectM/libprojectM.pc src/NativePresets/Makefile src/projectM-sdl/Makefile src/projectM-qt/Makefile diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am index 73d8353f6..f102b9fb7 100644 --- a/src/libprojectM/Makefile.am +++ b/src/libprojectM/Makefile.am @@ -48,6 +48,6 @@ libprojectM_la_SOURCES = ConfigFile.cpp Preset.cpp PresetLoader.cpp timer.cpp \ omptl/omptl_algorithm pkgconfigdir = $(libdir)/pkgconfig -# pkgconfig_DATA = src/libprojectM.pc -# EXTRA_DIST += src/libprojectM.pc.in -# CLEANFILES += src/libprojectM.pc +pkgconfig_DATA = libprojectM.pc +EXTRA_DIST += libprojectM.pc.in +CLEANFILES += libprojectM.pc diff --git a/src/libprojectM/libprojectM.pc.in b/src/libprojectM/libprojectM.pc.in index 90de75231..84f6694e8 100644 --- a/src/libprojectM/libprojectM.pc.in +++ b/src/libprojectM/libprojectM.pc.in @@ -1,12 +1,12 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ -libdir=@LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include -pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ -sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ +pkgdatadir=@datadir@/@PACKAGE_NAME@ +sysconfdir=@datadir@/@PACKAGE_NAME@ Name: libprojectM -Version: @PROJECTM_VERSION@ +Version: @PACKAGE_VERSION@ Description: projectM - OpenGL Milkdrop Requires: Libs: -L${libdir} -lprojectM From 9c7d9dfdd4c8c9360850cd4712ca2d46afdac62a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 15 Apr 2018 00:20:41 +0200 Subject: [PATCH 2/2] Install headers to /usr/include/libprojectM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit That is where the were before switching to autotools and where projects expect them. Signed-off-by: Andreas Müller --- src/Makefile.am | 4 ++++ src/libprojectM/Makefile.am | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ea0af3a36..85478b4de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,3 +7,7 @@ if ENABLE_QT endif SUBDIRS=libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR} + +# system headers/libraries/data to install +# for compatibility reasons here as nobase_include +nobase_include_HEADERS = libprojectM/projectM.hpp libprojectM/Common.hpp libprojectM/dlldefs.h libprojectM/event.h libprojectM/fatal.h libprojectM/PCM.hpp diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am index f102b9fb7..12d16cac4 100644 --- a/src/libprojectM/Makefile.am +++ b/src/libprojectM/Makefile.am @@ -11,8 +11,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/libprojectM/Renderer \ $(FTGL_CFLAGS) $(CG_CFLAGS) -# system headers/libraries/data to install -include_HEADERS = projectM.hpp Common.hpp dlldefs.h event.h fatal.h PCM.hpp lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library # link flags