Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://git.musicpd.org/cirrus/libmpdclient

Conflicts:

	Makefile.am
	src/example.c
	src/idle.c
This patch also moves status.h and stats.h to include/mpd to respect new
file location.
  • Loading branch information...
commit 539b21b77c2f13932be5e66d4da9c3c62e195111 2 parents dea6c54 + 5d2c92a
Marc Pavot authored
View
26 Makefile.am
@@ -3,18 +3,30 @@ AUTOMAKE_OPTIONS = foreign 1.9 dist-bzip2
doc_DATA = README
+mpdincludedir = $(includedir)/mpd
+mpdinclude_HEADERS = \
+ include/mpd/client.h \
+ include/mpd/connection.h \
+ include/mpd/idle.h \
+ include/mpd/status.h \
+ include/mpd/stats.h \
+ include/mpd/return_element.h \
+ include/mpd/song.h
+
+AM_CFLAGS += -Iinclude
+
lib_LTLIBRARIES = src/libmpdclient.la
src_libmpdclient_la_SOURCES = \
src/str_pool.c src/str_pool.h \
src/resolver.c src/resolver.h \
- src/connection.c src/connection.h \
- src/return_element.c src/return_element.h \
- src/idle.c src/idle.h \
- src/song.c src/song.h \
- src/status.c src/status.h \
- src/stats.c src/stats.h \
- src/libmpdclient.c src/libmpdclient.h
+ src/connection.c \
+ src/return_element.c \
+ src/idle.c \
+ src/song.c \
+ src/status.c \
+ src/stats.c \
+ src/libmpdclient.c
src_libmpdclient_la_LDFLAGS = -version-info @LIBMPDCLIENT_LIBTOOL_VERSION@ \
-Wl,--version-script=libmpdclient.ld
View
4 src/libmpdclient.h → include/mpd/client.h
@@ -33,8 +33,8 @@
#ifndef LIBMPDCLIENT_H
#define LIBMPDCLIENT_H
-#include "connection.h"
-#include "song.h"
+#include <mpd/connection.h>
+#include <mpd/song.h>
#ifdef WIN32
# define __W32API_USE_DLLIMPORT__ 1
View
3  src/connection.h → include/mpd/connection.h
@@ -33,8 +33,9 @@
#ifndef CONNECTION_H
#define CONNECTION_H
+#include <mpd/return_element.h>
+
#include <stdlib.h>
-#include "return_element.h"
enum mpd_ack {
MPD_ACK_ERROR_UNK = -1,
View
0  src/idle.h → include/mpd/idle.h
File renamed without changes
View
0  src/return_element.h → include/mpd/return_element.h
File renamed without changes
View
0  src/song.h → include/mpd/song.h
File renamed without changes
View
0  src/stats.h → include/mpd/stats.h
File renamed without changes
View
0  src/status.h → include/mpd/status.h
File renamed without changes
View
4 src/connection.c
@@ -30,9 +30,9 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "connection.h"
+#include <mpd/connection.h>
+#include <mpd/idle.h>
#include "resolver.h"
-#include "idle.h"
#include <assert.h>
#include <stdlib.h>
View
4 src/example.c
@@ -30,8 +30,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "libmpdclient.h"
-#include "status.h"
+#include <mpd/client.h>
+#include <mpd/status.h>
#include <stdio.h>
#include <string.h>
View
3  src/idle.c
@@ -30,7 +30,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "idle.h"
+#include <mpd/idle.h>
+
#include <stdio.h>
#include <string.h>
View
4 src/libmpdclient.c
@@ -30,10 +30,10 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "libmpdclient.h"
+#include <mpd/client.h>
+#include <mpd/return_element.h>
#include "resolver.h"
#include "str_pool.h"
-#include "return_element.h"
#include <assert.h>
#include <errno.h>
View
2  src/return_element.c
@@ -30,7 +30,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "return_element.h"
+#include <mpd/return_element.h>
#include "str_pool.h"
mpd_ReturnElement * mpd_newReturnElement(const char * name, const char * value)
View
2  src/song.c
@@ -30,7 +30,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "song.h"
+#include <mpd/song.h>
#include "str_pool.h"
#include <stdlib.h>
View
2  src/stats.c
@@ -30,7 +30,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "stats.h"
+#include <mpd/stats.h>
#include <stdlib.h>
#include <string.h>
View
2  src/status.c
@@ -30,7 +30,7 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "status.h"
+#include <mpd/status.h>
#include <stdlib.h>
#include <string.h>
Please sign in to comment.
Something went wrong with that request. Please try again.