diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-10-16 17:25:01 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2015-10-16 17:25:01 +0200 |
| commit | b8e7dfa4baffa4378aee618d66ebfedaa285b235 (patch) | |
| tree | dbe616d7b0792a003381a837cb6712b612a079fe /src | |
| parent | 1d8dd50455248f61e01c3a1d1d3605dac5c4b107 (diff) | |
build: Let 'make dist' do a better job
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Makefile.am | 1 | ||||
| -rw-r--r-- | src/fe-gtk/Makefile.am | 9 | ||||
| -rw-r--r-- | src/fe-text/Makefile.am | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 75aa12bc..cdab7925 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -20,6 +20,7 @@ EXTRA_DIST = \ inbound.h \ inet.h \ make-te.c \ + marshalers.list \ modes.h \ network.h \ notify.h \ diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index 778b6cfb..79cc2f32 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -7,15 +7,14 @@ bin_PROGRAMS = hexchat AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS) +hexchat_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(GUI_LIBS) EXTRA_DIST = \ ascii.h banlist.h chanlist.h chanview.h chanview-tabs.c \ chanview-tree.c custom-list.h editlist.h fe-gtk.h fkeys.h gtkutil.h joind.h \ maingui.h menu.h notifygui.h notifications palette.h pixmaps.h plugin-notification.h \ - plugin-tray.h plugingui.c plugingui.h rawlog.h sexy-iso-codes.h \ - sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h \ - ../../data/hexchat.gresource.xml + plugin-tray.h plugingui.c plugingui.h rawlog.h servlistgui.h setup.h sexy-iso-codes.h \ + sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h BUILT_SOURCES = resources.h resources.c @@ -53,6 +52,8 @@ resources.h: $(top_srcdir)/data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RES resources.c: $(top_srcdir)/data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --manual-register $< +EXTRA_DIST += $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data $(top_srcdir)/data/hexchat.gresource.xml) + if DO_STATIC_ANALYSIS analyze_plists = $(hexchat_SOURCES:%.c=%.plist) all-local: $(analyze_plists) diff --git a/src/fe-text/Makefile.am b/src/fe-text/Makefile.am index c4182803..0243e16f 100644 --- a/src/fe-text/Makefile.am +++ b/src/fe-text/Makefile.am @@ -4,6 +4,6 @@ bin_PROGRAMS = hexchat-text AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\" -hexchat_text_LDADD = ../common/libhexchatcommon.a $(COMMON_LIBS) +hexchat_text_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(COMMON_LIBS) hexchat_text_SOURCES = fe-text.c fe-text.h |