Skip to content

Commit

Permalink
meson: unbreak build
Browse files Browse the repository at this point in the history
This is a quick-and-dirty fix of the meson
build to get the GTK version compiled again.

data/labwc_tweaks.desktop is disabled but should be re-intantiated.
  • Loading branch information
Consolatis committed Apr 17, 2024
1 parent 83580d6 commit 24e7c0a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions data/meson.build
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
install_data(
'labwc-tweaks.svg',
'labwc_tweaks.svg',
install_dir : join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps'),
)
install_data(
'labwc-tweaks.desktop',
install_dir : join_paths(get_option('datadir'), 'applications'),
)
#install_data(
# 'labwc-tweaks.desktop',
# install_dir : join_paths(get_option('datadir'), 'applications'),
#)
18 changes: 9 additions & 9 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ gtkdeps = [dependency('gtk+-3.0'), dependency('libxml-2.0'), dependency('gio-2.0
executable(
meson.project_name(),
files(
'main.c',
'xml.c',
'environment.c',
'theme.c',
'keyboard-layouts.c',
'stack-appearance.c',
'stack-lang.c',
'stack-mouse.c',
'update.c',
'src/main.c',
'src/xml.c',
'src/environment.c',
'src/theme.c',
'src/keyboard-layouts.c',
'src/stack-appearance.c',
'src/stack-lang.c',
'src/stack-mouse.c',
'src/update.c',
),
dependencies: gtkdeps,
install : true,
Expand Down
2 changes: 1 addition & 1 deletion tests/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
test_lib = static_library(
'tests',
sources: files(
'../xml.c',
'../src/xml.c',
),
dependencies: [dependency('libxml-2.0'), dependency('glib-2.0')],
)
Expand Down
2 changes: 1 addition & 1 deletion tests/t1000-add-xpath-node.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <stdio.h>
#include <unistd.h>
#include "tap.h"
#include "../xml.h"
#include "../src/xml.h"

static char template[] =
"<?xml version=\"1.0\"?>\n"
Expand Down
2 changes: 1 addition & 1 deletion tests/t1001-nodenames.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <stdio.h>
#include <unistd.h>
#include "tap.h"
#include "../xml.c"
#include "../src/xml.c"

static char template[] =
"<?xml version=\"1.0\"?>\n"
Expand Down

0 comments on commit 24e7c0a

Please sign in to comment.