diff options
| author | TingPing <tingping@tingping.se> | 2014-06-09 13:45:24 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2014-06-09 13:54:16 -0400 |
| commit | 77d9d421fb14f99ee4624633535a762075c2a442 (patch) | |
| tree | cb0ea926ef9080442efd03f987560867be6cac54 | |
| parent | 59f3a65911d5a6488f62c2a843a20b71a7fcef1f (diff) | |
Partial fix for out of source builds
Patch from LRN Perl's makefile needs fixed and the relative include of config.h needs removed from hexchat.h Mentioned in #1018
| -rw-r--r-- | src/common/Makefile.am | 12 | ||||
| -rw-r--r-- | src/fe-gtk/Makefile.am | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 8a177fa9..b5ffe1ce 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -69,14 +69,14 @@ libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS) textenums.h: textevents.h -textevents.h: textevents.in make-te - $(AM_V_GEN) ./make-te < textevents.in > textevents.h 2> textenums.h +textevents.h: $(srcdir)/textevents.in make-te + $(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h -marshal.h: marshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --header $(srcdir)/marshalers.list > $@ +marshal.h: $(srcdir)/marshalers.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --header $< > $@ -marshal.c: marshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --body $(srcdir)/marshalers.list > $@ +marshal.c: $(srcdir)/marshalers.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --body $< > $@ BUILT_SOURCES = textenums.h textevents.h marshal.c marshal.h diff --git a/src/fe-gtk/Makefile.am b/src/fe-gtk/Makefile.am index 4ce02dbc..a8f43ac5 100644 --- a/src/fe-gtk/Makefile.am +++ b/src/fe-gtk/Makefile.am @@ -31,6 +31,7 @@ hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \ maingui.c notifygui.c palette.c pixmaps.c plugin-tray.c $(plugingui_c) \ rawlog.c resources.c servlistgui.c setup.c $(iso_codes_c) \ sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c +hexchat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/common -resources.c: ../../data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=../../data --generate-dependencies ../../data/hexchat.gresource.xml) - $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../../data --generate-source $< +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 $< |