Skip to content

Autotools pkgconfig #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2018
Merged

Autotools pkgconfig #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4305ce9
Re-add pkg-config support
schnitzeltony Apr 14, 2018
9c7d9df
Install headers to /usr/include/libprojectM
schnitzeltony Apr 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@revmischa revmischa Apr 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These were added here - #53 (diff)
What's the difference? What are the compatibility issues?

Copy link
Contributor Author

@schnitzeltony schnitzeltony Apr 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With CMake the files were installed to:

/usr/include/libprojectM

With Autotools all files are installed to

/usr/include

This is what this patch changes to avoid breakages in projects depending on projectM. Unfortunately it breaks make dist (haven't tested - my bad). I will try to fix and come back when I have something better. As said that might last because it is a just for fun issue to me and during the week there is not much time left for pure fun stuff...

How about a resend with pkg-config patch only and see if that passes Travis. If OK you can take that one before.

Copy link
Member

@revmischa revmischa Apr 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the files should definitely all be installed to /usr/include/libprojectM, I'm pretty sure. So if they are now, great! Just update the test and we should be good to go. And do test out make dist if you get a chance.

8 changes: 3 additions & 5 deletions src/libprojectM/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Copy link
Member

@revmischa revmischa Apr 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 💯 yay!

14 changes: 7 additions & 7 deletions src/libprojectM/libprojectM.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down