Fix for new paths

Add convenience makefile and autogen.sh
This commit is contained in:
Wim Taymans 2016-09-26 12:29:01 +02:00
parent 67dd3adb87
commit b9409e297b
8 changed files with 17 additions and 38 deletions

31
.gitignore vendored
View file

@ -2,39 +2,10 @@
.version .version
.*.swp .*.swp
ABOUT-NLS ABOUT-NLS
build-aux
intltool-extract.in
intltool-merge.in
intltool-update.in
*~ *~
*.tar.gz *.tar.gz
*.tar.xz *.tar.xz
.deps
.libs
*.la
*.lo
*.o *.o
Makefile config.h.meson
Makefile.in
aclocal.m4
autom4te.cache
compile
config.guess
config.h
config.h.in
config.log
config.rpath
config.status
config.sub
configure
depcomp
install-sh
libltdl
libtool
ltmain.sh
missing
mkinstalldirs
stamp-*
.dirstamp
pkgconfig/libpinos-*.pc pkgconfig/libpinos-*.pc

8
Makefile Normal file
View file

@ -0,0 +1,8 @@
all:
cd build && ninja-build
install:
cd build && ninja-build install
clean:
cd build && ninja-build clean

View file

@ -17,6 +17,6 @@
# Only there to make jhbuild happy # Only there to make jhbuild happy
NOCONFIGURE=1 ./bootstrap.sh rm -rf ./build
mkdir build
exec ./configure "$@" meson build $@

View file

@ -366,7 +366,7 @@ pinos_spa_alsa_monitor_new (PinosDaemon *daemon)
void *iface; void *iface;
if ((res = make_handle (&handle, if ((res = make_handle (&handle,
"spa/build/plugins/alsa/libspa-alsa.so", "build/spa/plugins/alsa/libspa-alsa.so",
"alsa-monitor", "alsa-monitor",
NULL)) < 0) { NULL)) < 0) {
g_error ("can't create alsa-monitor: %d", res); g_error ("can't create alsa-monitor: %d", res);

View file

@ -178,7 +178,7 @@ pinos_spa_audiotestsrc_new (PinosDaemon *daemon,
SpaResult res; SpaResult res;
if ((res = make_node (&n, if ((res = make_node (&n,
"spa/build/plugins/audiotestsrc/libspa-audiotestsrc.so", "build/spa/plugins/audiotestsrc/libspa-audiotestsrc.so",
"audiotestsrc")) < 0) { "audiotestsrc")) < 0) {
g_error ("can't create audiotestsrc: %d", res); g_error ("can't create audiotestsrc: %d", res);
return NULL; return NULL;

View file

@ -366,7 +366,7 @@ pinos_spa_v4l2_monitor_new (PinosDaemon *daemon)
void *iface; void *iface;
if ((res = make_handle (&handle, if ((res = make_handle (&handle,
"spa/build/plugins/v4l2/libspa-v4l2.so", "build/spa/plugins/v4l2/libspa-v4l2.so",
"v4l2-monitor", "v4l2-monitor",
NULL)) < 0) { NULL)) < 0) {
g_error ("can't create v4l2-monitor: %d", res); g_error ("can't create v4l2-monitor: %d", res);

View file

@ -149,7 +149,7 @@ pinos_spa_videotestsrc_new (PinosDaemon *daemon,
SpaResult res; SpaResult res;
if ((res = make_node (&n, if ((res = make_node (&n,
"spa/build/plugins/videotestsrc/libspa-videotestsrc.so", "build/spa/plugins/videotestsrc/libspa-videotestsrc.so",
"videotestsrc")) < 0) { "videotestsrc")) < 0) {
g_error ("can't create videotestsrc: %d", res); g_error ("can't create videotestsrc: %d", res);
return NULL; return NULL;

View file

@ -284,7 +284,7 @@ pinos_client_node_new (PinosDaemon *daemon,
g_return_val_if_fail (PINOS_IS_DAEMON (daemon), NULL); g_return_val_if_fail (PINOS_IS_DAEMON (daemon), NULL);
if ((res = make_node (&n, if ((res = make_node (&n,
"spa/build/plugins/remote/libspa-remote.so", "build/spa/plugins/remote/libspa-remote.so",
"proxy")) < 0) { "proxy")) < 0) {
g_error ("can't create proxy: %d", res); g_error ("can't create proxy: %d", res);
return NULL; return NULL;