Skip to content

Fix automake cohabitation with qt #47

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 1 commit into from
Apr 4, 2018
Merged

Fix automake cohabitation with qt #47

Show file tree
Hide file tree
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
10 changes: 7 additions & 3 deletions src/projectM-pulseaudio/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@ AM_CFLAGS = ${my_CFLAGS} \
bin_PROGRAMS = projectM-pulseaudio

projectM_pulseaudio_SOURCES = \
$(projectM_pulseaudio_moc_sources) \
qprojectM-pulseaudio.cpp \
QPulseAudioDeviceChooser.cpp \
QPulseAudioDeviceModel.cpp \
QPulseAudioThread.cpp
QPulseAudioThread.cpp \
PulseDeviceChooserDialog.ui \
$(projectM_pulseaudio_qtheaders)

nodist_projectM_pulseaudio_SOURCES = \
$(nodist_projectM_pulseaudio_moc_sources)

projectM_pulseaudio_LDADD = \
${QT_LIBS} \
Expand All @@ -54,7 +58,7 @@ BUILT_SOURCES = \

CLEANFILES = \
${BUILT_SOURCES} \
${projectM_pulseaudio_moc_sources}
${nodist_projectM_pulseaudio_moc_sources}

desktopdir = $(datadir)/applications
dist_desktop_DATA = projectM-pulseaudio.desktop
Expand Down
15 changes: 11 additions & 4 deletions src/projectM-qt/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,25 @@ BUILT_SOURCES = \
noinst_LIBRARIES = libprojectM_qt.a

libprojectM_qt_a_SOURCES = \
$(projectM_qt_moc_sources) \
qprojectm_mainwindow.cpp \
configfile.hpp configfile.cpp \
qplaylistfiledialog.cpp \
qplaylistmodel.cpp \
qprojectmconfigdialog.cpp \
qpresettextedit.cpp \
qpreseteditordialog.cpp
qpreseteditordialog.cpp \
qprojectm_mainwindow.ui \
qpreseteditordialog.ui \
qprojectmconfigdialog.ui \
$(projectM_qt_qtheaders) \
qxmlplaylisthandler.hpp \
nullable.hpp \
application.qrc \
images/*

nodist_libprojectM_qt_a_SOURCES = \
application_qrc.cpp \
$(test_moc_sources)
$(nodist_projectM_qt_moc_sources)

AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
Expand All @@ -67,4 +74,4 @@ AM_CFLAGS = ${my_CFLAGS} \
CLEANFILES = \
application_qrc.cpp \
${BUILT_SOURCES} \
${projectM_qt_moc_sources}
${nodist_projectM_qt_moc_sources}