Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

build-sys: try to get rid of remaining/epidemic header double-install. #21

Open
klihub wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build-sys: try to get rid of remaining/epidemic header double-install. #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 2 additions & 13 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@ libmurphy_common_la_DEPENDENCIES = \
$(abs_top_builddir)/src/linker-script.common \
$(filter %.la, $(libmurphy_common_la_LIBADD))

libcommonincludedir = $(includedir)/murphy/common
libcommoninclude_HEADERS = $(libmurphy_common_la_HEADERS)

if WEBSOCKETS_ENABLED
libmurphy_common_la_HEADERS += \
Expand Down Expand Up @@ -784,7 +782,7 @@ EXTRA_DIST += common/murphy-pulse.pc
pkgconfig_DATA += common/murphy-pulse.pc

libmurphy_pulse_ladir = \
$(includedir)/murphy/common
$(includedir)/murphy/pulse

libmurphy_pulse_la_HEADERS = $(murphy_pulse_headers)

Expand All @@ -808,8 +806,6 @@ libmurphy_pulse_la_DEPENDENCIES = \
$(abs_top_builddir)/src/linker-script.pulse \
$(filter %.la, $(libmurphy_pulse_la_LIBADD))

libpulseincludedir = $(includedir)/murphy/pulse
libpulseinclude_HEADERS = $(libmurphy_pulse_la_HEADERS)
endif

# linker script generation
Expand Down Expand Up @@ -857,8 +853,7 @@ libmurphy_ecore_la_DEPENDENCIES = \
$(abs_top_builddir)/src/linker-script.ecore \
$(filter %.la, $(libmurphy_ecore_la_LIBADD))

libecoreincludedir = $(includedir)/murphy/ecore
libecoreinclude_HEADERS = $(libmurphy_ecore_la_HEADERS)

endif

# linker script generation
Expand Down Expand Up @@ -904,9 +899,6 @@ libmurphy_glib_la_LIBADD = \
libmurphy_glib_la_DEPENDENCIES = \
$(abs_top_builddir)/src/linker-script.glib \
$(filter %.la, $(libmurphy_glib_la_LIBADD))

libglibincludedir = $(includedir)/murphy/glib
libglibinclude_HEADERS = $(libmurphy_glib_la_HEADERS)
endif

# linker script generation
Expand Down Expand Up @@ -953,9 +945,6 @@ libmurphy_qt_la_DEPENDENCIES = \
$(abs_top_builddir)/src/linker-script.qt \
$(filter %.la, $(libmurphy_qt_la_LIBADD))

libqtincludedir = $(includedir)/murphy/qt
libqtinclude_HEADERS = $(libmurphy_qt_la_HEADERS)

# run moc to generate Qt meta objects
common/qt-glue-priv.moc.h: common/qt-glue-priv.h
$(QUIET_GEN)$(QT_MOC) -DQT_ENABLED=1 $< -o$@
Expand Down