Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build documentation during build-time, and add a bt-audio implementation #52

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ src/bt-serial
stamp-h1
test_*
tmp/
*.1
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ dist-hook:

CLEANFILES = $(top_srcdir)/.version

SUBDIRS = src
SUBDIRS = doc src

EXTRA_DIST = git-version-gen
5 changes: 5 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ bt-agent
authorize a connection/service request, etc)


bt-audio
========

- Connect to devices to play audio from them

bt-device
=========

Expand Down
9 changes: 8 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,12 @@ LIBREADLINE="-lreadline"

AC_SUBST(LIBREADLINE)

AC_CONFIG_FILES([Makefile src/Makefile])
AC_ARG_WITH([manpages],
[AS_HELP_STRING([--without-manpages], [disable building the manual pages])],
[],
[AC_CHECK_PROG(POD2MAN, [pod2man], [pod2man])
AS_IF([test -z "x$POD2MAN"],
[AC_MSG_WARN([Couldn't find $POD2MAN, won't build manpages])])])

AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile])
AC_OUTPUT
14 changes: 0 additions & 14 deletions contrib/build-mans.sh

This file was deleted.

9 changes: 9 additions & 0 deletions doc/Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dist_man_MANS = bt-adapter.1 \
bt-agent.1 \
bt-audio.1 \
bt-device.1 \
bt-network.1 \
bt-obex.1

.pod.1:
$(POD2MAN) -c "General Commands Manual" -r "$(PACKAGE_NAME) $(PACKAGE_VERSION)" $^ >$@
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 2 additions & 3 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,11 @@ lib_sources = lib/agent-helper.c lib/agent-helper.h \
lib/sdp.c lib/sdp.h \
lib/bluez-api.h

bin_PROGRAMS = bt-adapter bt-agent bt-device bt-network bt-obex
bin_PROGRAMS = bt-adapter bt-agent bt-audio bt-device bt-network bt-obex
bt_adapter_SOURCES = $(lib_sources) $(bluez_sources) bt-adapter.c
bt_agent_SOURCES = $(lib_sources) $(bluez_sources) bt-agent.c
bt_audio_SOURCES = $(lib_sources) $(bluez_sources) bt-audio.c
bt_device_SOURCES = $(lib_sources) $(bluez_sources) bt-device.c
bt_network_SOURCES = $(lib_sources) $(bluez_sources) bt-network.c
bt_obex_SOURCES = $(lib_sources) $(bluez_sources) bt-obex.c
bt_obex_LDADD = $(LDADD) $(LIBREADLINE)

dist_man_MANS = bt-adapter.1 bt-agent.1 bt-device.1 bt-network.1 bt-obex.1
243 changes: 0 additions & 243 deletions src/bt-adapter.1

This file was deleted.

Loading