James Hunt has proposed merging lp:~jamesodhunt/upstart/fix-libupstart into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~jamesodhunt/upstart/fix-libupstart/+merge/172371 * lib/Makefile.am: - Install client library headers. - Add missing backslash. * lib/upstart.h: Look in upstart/ sub-directory for auto-generated header files. -- https://code.launchpad.net/~jamesodhunt/upstart/fix-libupstart/+merge/172371 Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/fix-libupstart into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-06-28 13:21:34 +0000 +++ ChangeLog 2013-07-01 17:14:24 +0000 @@ -1,3 +1,11 @@ +2013-07-01 James Hunt <[email protected]> + + * lib/Makefile.am: + - Install client library headers. + - Add missing backslash. + * lib/upstart.h: Look in upstart/ sub-directory for + auto-generated header files. + 2013-06-28 James Hunt <[email protected]> * NEWS: Release 1.9 === modified file 'lib/Makefile.am' --- lib/Makefile.am 2013-06-27 10:16:35 +0000 +++ lib/Makefile.am 2013-07-01 17:14:24 +0000 @@ -23,12 +23,25 @@ # The library is built from the autogenerated code. libupstart_la_SOURCES = upstart.h +include_HEADERS = $(libupstart_la_SOURCES) + +upstartincludedir = $(includedir)/upstart + +upstartinclude_HEADERS = \ + com.ubuntu.Upstart.h \ + com.ubuntu.Upstart.Instance.h \ + com.ubuntu.Upstart.Job.h \ + upstart-dbus.h + +upstart-dbus.h: $(top_srcdir)/dbus/upstart.h + cp $< $@; + nodist_libupstart_la_SOURCES = \ $(com_ubuntu_Upstart_OUTPUTS) \ $(com_ubuntu_Upstart_Job_OUTPUTS) \ $(com_ubuntu_Upstart_Instance_OUTPUTS) -libupstart_la_LIBADD = +libupstart_la_LIBADD = \ $(LTLIBINTL) \ $(NIH_LIBS) \ $(NIH_DBUS_LIBS) \ @@ -148,7 +161,7 @@ tests: $(check_PROGRAMS) clean-local: - rm -f *.gcno *.gcda + rm -f *.gcno *.gcda upstart-dbus.h maintainer-clean-local: rm -f *.gcov === modified file 'lib/upstart.h' --- lib/upstart.h 2013-05-22 11:11:00 +0000 +++ lib/upstart.h 2013-07-01 17:14:24 +0000 @@ -24,9 +24,10 @@ NIH_BEGIN_EXTERN -#include "com.ubuntu.Upstart.h" -#include "com.ubuntu.Upstart.Instance.h" -#include "com.ubuntu.Upstart.Job.h" +#include "upstart/upstart-dbus.h" +#include "upstart/com.ubuntu.Upstart.h" +#include "upstart/com.ubuntu.Upstart.Instance.h" +#include "upstart/com.ubuntu.Upstart.Job.h" NIH_END_EXTERN
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
