diff --git a/.gitignore b/.gitignore index da53184..7b8d85d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,13 @@ *~ debian/files -debian/libgbinder-dev debian/libgbinder +debian/libgbinder-dev +debian/libgbinder-tools debian/*.debhelper.log debian/*.debhelper debian/*.substvars -debian/*.install +debian/libgbinder.install +debian/libgbinder-dev.install debian/tmp documentation.list installroot diff --git a/Makefile b/Makefile index dad1799..17b2641 100644 --- a/Makefile +++ b/Makefile @@ -231,7 +231,7 @@ clean: rm -fr debian/tmp debian/libgbinder debian/libgbinder-dev rm -f documentation.list debian/files debian/*.substvars rm -f debian/*.debhelper.log debian/*.debhelper debian/*~ - rm -f debian/*.install + rm -f debian/libgbinder.install debian/libgbinder-dev.install test: make -C unit test diff --git a/debian/control b/debian/control index d4dcf4c..5b56d31 100644 --- a/debian/control +++ b/debian/control @@ -16,3 +16,9 @@ Section: libdevel Architecture: any Depends: libgbinder (= ${binary:Version}), ${misc:Depends} Description: Development files for libgbinder + +Package: libgbinder-tools +Section: utils +Architecture: any +Depends: libgbinder, ${misc:Depends} +Description: Binder command line utilities diff --git a/debian/libgbinder-tools.install b/debian/libgbinder-tools.install new file mode 100644 index 0000000..bd72fef --- /dev/null +++ b/debian/libgbinder-tools.install @@ -0,0 +1 @@ +debian/tmp/usr/bin/* usr/bin diff --git a/debian/rules b/debian/rules index e09bcc0..1b91586 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,13 @@ LIBDIR=usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_build: dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder.install debian/libgbinder-dev.install + dh_auto_build -- -C test/binder-list release + dh_auto_build -- -C test/binder-ping release override_dh_auto_install: dh_auto_install -- LIBDIR=$(LIBDIR) install-dev + dh_auto_install -- -C test/binder-list + dh_auto_install -- -C test/binder-ping %: dh $@ diff --git a/rpm/libgbinder.spec b/rpm/libgbinder.spec index 639b59c..3e96d52 100644 --- a/rpm/libgbinder.spec +++ b/rpm/libgbinder.spec @@ -30,10 +30,14 @@ This package contains the development library for %{name}. %build make LIBDIR=%{_libdir} KEEP_SYMBOLS=1 release pkgconfig +make -C test/binder-list release +make -C test/binder-ping release %install rm -rf %{buildroot} make LIBDIR=%{_libdir} DESTDIR=%{buildroot} install-dev +make -C test/binder-list DESTDIR=%{buildroot} install +make -C test/binder-ping DESTDIR=%{buildroot} install %check make -C unit test @@ -51,3 +55,16 @@ make -C unit test %{_libdir}/pkgconfig/*.pc %{_libdir}/%{name}.so %{_includedir}/gbinder/*.h + +# Tools + +%package tools +Summary: Binder tools + +%description tools +Binder command line utilities + +%files tools +%defattr(-,root,root,-) +%{_bindir}/binder-list +%{_bindir}/binder-ping diff --git a/test/binder-list/Makefile b/test/binder-list/Makefile index c61bf1b..b1169dd 100644 --- a/test/binder-list/Makefile +++ b/test/binder-list/Makefile @@ -138,3 +138,17 @@ libgbinder-debug: libgbinder-release: @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE) + +# +# Install +# + +INSTALL = install + +INSTALL_BIN_DIR = $(DESTDIR)/usr/bin + +install: release $(INSTALL_BIN_DIR) + $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR) + +$(INSTALL_BIN_DIR): + $(INSTALL) -d $@ diff --git a/test/binder-ping/Makefile b/test/binder-ping/Makefile index f016d07..bf7bf60 100644 --- a/test/binder-ping/Makefile +++ b/test/binder-ping/Makefile @@ -138,3 +138,17 @@ libgbinder-debug: libgbinder-release: @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE) + +# +# Install +# + +INSTALL = install + +INSTALL_BIN_DIR = $(DESTDIR)/usr/bin + +install: release $(INSTALL_BIN_DIR) + $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR) + +$(INSTALL_BIN_DIR): + $(INSTALL) -d $@