diff --git a/.gitignore b/.gitignore index 59cf0a027..a64c06153 100644 --- a/.gitignore +++ b/.gitignore @@ -2,39 +2,10 @@ .version .*.swp ABOUT-NLS -build-aux -intltool-extract.in -intltool-merge.in -intltool-update.in *~ *.tar.gz *.tar.xz -.deps -.libs -*.la -*.lo *.o -Makefile -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 +config.h.meson pkgconfig/libpinos-*.pc diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..256e1b5f3 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +all: + cd build && ninja-build + +install: + cd build && ninja-build install + +clean: + cd build && ninja-build clean diff --git a/autogen.sh b/autogen.sh index 416877e9f..607ef9f55 100755 --- a/autogen.sh +++ b/autogen.sh @@ -17,6 +17,6 @@ # Only there to make jhbuild happy -NOCONFIGURE=1 ./bootstrap.sh - -exec ./configure "$@" +rm -rf ./build +mkdir build +meson build $@ diff --git a/pinos/modules/spa/spa-alsa-monitor.c b/pinos/modules/spa/spa-alsa-monitor.c index 5db4db84c..e11f9cfc0 100644 --- a/pinos/modules/spa/spa-alsa-monitor.c +++ b/pinos/modules/spa/spa-alsa-monitor.c @@ -366,7 +366,7 @@ pinos_spa_alsa_monitor_new (PinosDaemon *daemon) void *iface; if ((res = make_handle (&handle, - "spa/build/plugins/alsa/libspa-alsa.so", + "build/spa/plugins/alsa/libspa-alsa.so", "alsa-monitor", NULL)) < 0) { g_error ("can't create alsa-monitor: %d", res); diff --git a/pinos/modules/spa/spa-audiotestsrc.c b/pinos/modules/spa/spa-audiotestsrc.c index 877223fda..83d0cb16b 100644 --- a/pinos/modules/spa/spa-audiotestsrc.c +++ b/pinos/modules/spa/spa-audiotestsrc.c @@ -178,7 +178,7 @@ pinos_spa_audiotestsrc_new (PinosDaemon *daemon, SpaResult res; if ((res = make_node (&n, - "spa/build/plugins/audiotestsrc/libspa-audiotestsrc.so", + "build/spa/plugins/audiotestsrc/libspa-audiotestsrc.so", "audiotestsrc")) < 0) { g_error ("can't create audiotestsrc: %d", res); return NULL; diff --git a/pinos/modules/spa/spa-v4l2-monitor.c b/pinos/modules/spa/spa-v4l2-monitor.c index f1daf1a4f..b9281da87 100644 --- a/pinos/modules/spa/spa-v4l2-monitor.c +++ b/pinos/modules/spa/spa-v4l2-monitor.c @@ -366,7 +366,7 @@ pinos_spa_v4l2_monitor_new (PinosDaemon *daemon) void *iface; if ((res = make_handle (&handle, - "spa/build/plugins/v4l2/libspa-v4l2.so", + "build/spa/plugins/v4l2/libspa-v4l2.so", "v4l2-monitor", NULL)) < 0) { g_error ("can't create v4l2-monitor: %d", res); diff --git a/pinos/modules/spa/spa-videotestsrc.c b/pinos/modules/spa/spa-videotestsrc.c index fe9be234c..538fc0f90 100644 --- a/pinos/modules/spa/spa-videotestsrc.c +++ b/pinos/modules/spa/spa-videotestsrc.c @@ -149,7 +149,7 @@ pinos_spa_videotestsrc_new (PinosDaemon *daemon, SpaResult res; if ((res = make_node (&n, - "spa/build/plugins/videotestsrc/libspa-videotestsrc.so", + "build/spa/plugins/videotestsrc/libspa-videotestsrc.so", "videotestsrc")) < 0) { g_error ("can't create videotestsrc: %d", res); return NULL; diff --git a/pinos/server/client-node.c b/pinos/server/client-node.c index bcae2e2b5..bd9d5e19f 100644 --- a/pinos/server/client-node.c +++ b/pinos/server/client-node.c @@ -284,7 +284,7 @@ pinos_client_node_new (PinosDaemon *daemon, g_return_val_if_fail (PINOS_IS_DAEMON (daemon), NULL); if ((res = make_node (&n, - "spa/build/plugins/remote/libspa-remote.so", + "build/spa/plugins/remote/libspa-remote.so", "proxy")) < 0) { g_error ("can't create proxy: %d", res); return NULL;