Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

- moved proxy library to subdirectory #933

Merged
merged 1 commit into from
Sep 19, 2024
Merged

- moved proxy library to subdirectory #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions client/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,10 @@
# Makefile.am for snapper/client
#

SUBDIRS = utils
SUBDIRS = utils proxy

AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)

noinst_LTLIBRARIES = libclient.la libproxy.la

libclient_la_SOURCES = \
types.cc types.h \
commands.cc commands.h \
errors.cc errors.h

libclient_la_LIBADD = \
utils/libutils.la \
../dbus/libdbus.la

libproxy_la_SOURCES = \
proxy.cc proxy.h \
proxy-dbus.cc proxy-dbus.h \
proxy-lib.cc proxy-lib.h

bin_PROGRAMS = snapper

snapper_SOURCES = \
Expand Down Expand Up @@ -53,8 +37,8 @@ snapper_SOURCES = \
GlobalOptions.cc GlobalOptions.h

snapper_LDADD = \
libproxy.la \
libclient.la \
proxy/libproxy.la \
proxy/libclient.la \
../snapper/libsnapper.la \
utils/libutils.la \
../dbus/libdbus.la \
Expand All @@ -71,8 +55,8 @@ systemd_helper_SOURCES = \
misc.cc misc.h

systemd_helper_LDADD = \
libproxy.la \
libclient.la \
proxy/libproxy.la \
proxy/libclient.la \
../snapper/libsnapper.la \
utils/libutils.la \
../dbus/libdbus.la
Expand Down
2 changes: 1 addition & 1 deletion client/MyFiles.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <iostream>

#include "proxy.h"
#include "proxy/proxy.h"
#include "utils/text.h"
#include "GlobalOptions.h"

Expand Down
2 changes: 1 addition & 1 deletion client/cleanup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <functional>

#include "proxy.h"
#include "proxy/proxy.h"


/*
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-cleanup.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
#include "utils/HumanString.h"
#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "cleanup.h"
#include "misc.h"
#include "cmd.h"
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-create-config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-create.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-debug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-delete-config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-delete.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-diff.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"
#include "MyFiles.h"

Expand Down
2 changes: 1 addition & 1 deletion client/cmd-get-config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"
#include "utils/TableFormatter.h"
#include "utils/CsvFormatter.h"
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-list-configs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"
#include "utils/TableFormatter.h"
#include "utils/CsvFormatter.h"
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-list.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "locker.h"
#include "misc.h"
#include "utils/TableFormatter.h"
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-modify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-mount.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-rollback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-set-config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "misc.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-setup-quota.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-status.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "MyFiles.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-umount.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <iostream>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/cmd-undochange.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#include "utils/text.h"
#include "utils/help.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "MyFiles.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd-xadiff.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include <snapper/XAttributes.h>

#include "utils/text.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"
#include "proxy.h"
#include "MyFiles.h"


Expand Down
2 changes: 1 addition & 1 deletion client/cmd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "config.h"

#include "proxy.h"
#include "proxy/proxy.h"
#include "GlobalOptions.h"


Expand Down
2 changes: 1 addition & 1 deletion client/locker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/


#include "proxy.h"
#include "proxy/proxy.h"


namespace snapper
Expand Down
2 changes: 1 addition & 1 deletion client/misc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include "client/utils/text.h"
#include "client/utils/GetOpts.h"
#include "proxy.h"
#include "proxy/proxy.h"


using namespace snapper;
Expand Down
21 changes: 21 additions & 0 deletions client/proxy/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Makefile.am for snapper/client/proxy
#

AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)

noinst_LTLIBRARIES = libclient.la libproxy.la

libclient_la_SOURCES = \
types.cc types.h \
commands.cc commands.h \
errors.cc errors.h

libclient_la_LIBADD = \
../utils/libutils.la \
../../dbus/libdbus.la

libproxy_la_SOURCES = \
proxy.cc proxy.h \
proxy-dbus.cc proxy-dbus.h \
proxy-lib.cc proxy-lib.h
2 changes: 1 addition & 1 deletion client/commands.cc → client/proxy/commands.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "commands.h"
#include "errors.h"
#include "utils/text.h"
#include "../utils/text.h"
#include "dbus/DBusPipe.h"
#include "snapper/AppUtil.h"

Expand Down
0 client/commands.h → client/proxy/commands.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion client/errors.cc → client/proxy/errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <snapper/AppUtil.h>
#include <snapper/Snapper.h>

#include "utils/text.h"
#include "../utils/text.h"

#include "errors.h"

Expand Down
0 client/errors.h → client/proxy/errors.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion client/proxy-dbus.cc → client/proxy/proxy-dbus.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "proxy-dbus.h"
#include "commands.h"
#include "utils/text.h"
#include "../utils/text.h"


using namespace std;
Expand Down
0 client/proxy-dbus.h → client/proxy/proxy-dbus.h
View file
Open in desktop
File renamed without changes.
0 client/proxy-lib.cc → client/proxy/proxy-lib.cc
View file
Open in desktop
File renamed without changes.
0 client/proxy-lib.h → client/proxy/proxy-lib.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion client/proxy.cc → client/proxy/proxy.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <snapper/AppUtil.h>
#include <snapper/SnapperDefines.h>

#include "utils/text.h"
#include "../utils/text.h"
#include "proxy.h"


Expand Down
0 client/proxy.h → client/proxy/proxy.h
View file
Open in desktop
File renamed without changes.
0 client/types.cc → client/proxy/types.cc
View file
Open in desktop
File renamed without changes.
0 client/types.h → client/proxy/types.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions client/snapper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@
#include "utils/text.h"
#include "utils/Table.h"
#include "utils/GetOpts.h"
#include "proxy/errors.h"
#include "proxy/proxy.h"

#include "errors.h"
#include "proxy.h"
#include "GlobalOptions.h"
#include "cmd.h"

Expand Down
4 changes: 2 additions & 2 deletions client/systemd-helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@

#include "utils/text.h"
#include "utils/GetOpts.h"
#include "proxy/proxy.h"
#include "proxy/errors.h"

#include "proxy.h"
#include "cleanup.h"
#include "errors.h"
#include "misc.h"


Expand Down
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ AC_CONFIG_FILES([
server/Makefile
client/Makefile
client/utils/Makefile
client/proxy/Makefile
scripts/Makefile
pam/Makefile
data/Makefile
Expand Down
2 changes: 1 addition & 1 deletion po/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ XGETTEXT = xgettext
MSGFMT = msgfmt
MSGMERGE = msgmerge

SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc)
SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc ../client/proxy/*.cc)

POFILES = $(wildcard *.po)

Expand Down
2 changes: 1 addition & 1 deletion zypp-plugin/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ snapper_zypp_plugin_SOURCES = \
zypp-plugin.cc zypp-plugin.h

snapper_zypp_plugin_LDADD = \
../client/libclient.la \
../client/proxy/libclient.la \
../snapper/libsnapper.la \
../dbus/libdbus.la \
../stomp/libstomp.la \
Expand Down
Loading
Loading