Skip to content

Move busctl to its own dir and other cleanups#5706

Merged
poettering merged 8 commits intosystemd:masterfrom
keszybz:make-cleanups
Apr 5, 2017
Merged

Move busctl to its own dir and other cleanups#5706
poettering merged 8 commits intosystemd:masterfrom
keszybz:make-cleanups

Conversation

@keszybz
Copy link
Copy Markdown
Member

@keszybz keszybz commented Apr 5, 2017

Fallout from #5704.

keszybz added 8 commits April 4, 2017 20:36
busctl is not part of libsystemd, and should not be stored under libsystemd.
In particular this is confusing because busctl is linked with libshared, but
stuff in libsystemd is not supposed to depend on libshared.
We used ENABLE_LOGIND for the automake conditional, and HAVE_LOGIND
for the ifdef. That wasn't wrong, but it certainly was confusing.

Also, move the ifdeffery to avoid warning about unused static function
logind_set_wall_message() when logind is disabled.
We defined both $(VERSION) and $(PACKAGE_VERSION) with the same contents.
$(PACKAGE_VERSION) is slightly more descriptive, so settle on that, and
drop the other define.
This makes it easier to use the same generator script as for other
gperf scripts. With automake each gperf file had it's own rule, but
with meson I'm trying to use one script, and this inconsistency made
that harder.
Copy link
Copy Markdown
Contributor

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really nice cleanup, even independently of meson-or-not. Thanks!

@martinpitt martinpitt added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Apr 5, 2017
@poettering poettering merged commit 6cb484c into systemd:master Apr 5, 2017
@keszybz keszybz deleted the make-cleanups branch April 5, 2017 23:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build-system good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed

Development

Successfully merging this pull request may close these issues.

3 participants