devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'Dav1d23/master'

Browse Source 
Conflicts:
	Makefile.am
	install-all.sh
This commit is contained in:
James Booth
2016-04-11 00:23:36 +01:00
parent 5ddde3e59a b300fa5baf
commit 697db019d5
10 changed files with 285 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@@ -47,7 +47,8 @@ core_sources = \
src/plugins/callbacks.h src/plugins/callbacks.c \
src/plugins/autocompleters.c src/plugins/autocompleters.h \
src/plugins/themes.c src/plugins/themes.h \
src/plugins/settings.c src/plugins/settings.h
src/plugins/settings.c src/plugins/settings.h \
src/tray.h src/tray.c
unittest_sources = \
src/contact.c src/contact.h src/common.c \
@@ -84,6 +85,7 @@ unittest_sources = \
src/window_list.c src/window_list.h \
src/event/server_events.c src/event/server_events.h \
src/event/client_events.c src/event/client_events.h \
src/tray.h src/tray.c \
tests/unittests/xmpp/stub_xmpp.c \
tests/unittests/ui/stub_ui.c \
tests/unittests/log/stub_log.c \
@@ -169,6 +171,8 @@ otr_unittest_sources = \
themes_sources = themes/*
icons_sources = icons/*
script_sources = bootstrap.sh configure-debug install-all.sh
man_sources = docs/profanity.1
@@ -197,6 +201,8 @@ endif
if INCLUDE_GIT_VERSION
BUILT_SOURCES = $(git_include)
endif
profanity_iconsdir = @ICONS_PATH@
profanity_icons_DATA = $(icons_sources)
if BUILD_C_API
lib_LTLIBRARIES = libprofanity.la
@@ -225,7 +231,7 @@ endif
man_MANS = $(man_sources)
EXTRA_DIST = $(man_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt
EXTRA_DIST = $(man_sources) $(icons_sources) $(themes_sources) $(script_sources) profrc.example LICENSE.txt
if INCLUDE_GIT_VERSION
EXTRA_DIST += .git/HEAD .git/index