mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-03-04 06:25:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pkgconfig' of github.com:projectM-visualizer/projectm into pkgconfig

Browse Source
This commit is contained in:
Mischa Spiegelmock
2018-04-27 12:13:40 +03:00
parent 20978b0d8f f7f2dd4214
commit 4594aeca68
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -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

4
src/Makefile.am
View File

@ -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

8
src/libprojectM/Makefile.am
View File

@ -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
@ -48,6 +46,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

14
src/libprojectM/libprojectM.pc.in
View File

@ -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