Move transmission-remote to utils

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 2ecf83dc31c7c86cc0aa593f0e871f5564c341af..3b34ed116a0bcb99c70360c5240acda21d345422 100644 (file)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -46,19 +46,7 @@ if(WITH_SYSTEMD)
     target_link_libraries(${TR_NAME}-daemon ${SYSTEMD_LIBRARIES})
 endif()
 
-tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE
-    "Transmission Utility ('remote')"
-    "${TR_NAME}-remote"
-    "${TR_NAME}-remote.exe")
-
-add_executable(${TR_NAME}-remote remote.c ${${PROJECT_NAME}_remote_WIN32_RC_FILE})
-
-target_link_libraries(${TR_NAME}-remote
-    ${TR_NAME}
-    ${CURL_LIBRARIES}
-)
-
-foreach(P daemon remote)
+foreach(P daemon)
     install(TARGETS ${TR_NAME}-${P} DESTINATION ${CMAKE_INSTALL_BINDIR})
 
     if(INSTALL_DOC)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 34d7076c43cb58d6369442f1a236fbbf0446ddd3..28550a2d193a064011204e8a7b361bad793208a3 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -11,12 +11,10 @@ EXTRA_DIST = \
     transmission-daemon.service
 
 dist_man_MANS = \
-    transmission-daemon.1 \
-    transmission-remote.1
+    transmission-daemon.1
 
 bin_PROGRAMS = \
-    transmission-daemon \
-    transmission-remote
+    transmission-daemon
 
 LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
@@ -37,7 +35,6 @@ LDADD = \
 noinst_HEADERS = daemon.h
 
 transmission_daemon_SOURCES = daemon.c
-transmission_remote_SOURCES = remote.c
 
 if WIN32
 transmission_daemon_SOURCES += daemon-win32.c

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index 7528fe1bdf38efd12451f779896d6d2ebf047dfc..6452707f58811372310703a4b71259c85cbda703 100644 (file)
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -2,7 +2,7 @@ project(trutils)
 
 include_directories(${CMAKE_SOURCE_DIR})
 
-foreach(P create edit show)
+foreach(P create edit remote show)
     tr_win32_app_info(${PROJECT_NAME}_${P}_WIN32_RC_FILE
         "Transmission Utility ('${P}')"
         "${TR_NAME}-${P}"

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 0c2c8980e8f466e700012ad50f07bf33f064df16..855137efe7a7a3fe74e38aaf5b4cf0cd57aaf7f9 100644 (file)
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -9,10 +9,12 @@ AM_CFLAGS = \
 bin_PROGRAMS = \
     transmission-create \
     transmission-edit \
+    transmission-remote \
     transmission-show
 
 transmission_create_SOURCES = create.c
 transmission_edit_SOURCES = edit.c
+transmission_remote_SOURCES = remote.c
 transmission_show_SOURCES = show.c
 
 noinst_HEADERS = \
@@ -21,6 +23,7 @@ noinst_HEADERS = \
 dist_man_MANS = \
     transmission-create.1 \
     transmission-edit.1 \
+    transmission-remote.1 \
     transmission-show.1
 
 transmission_create_LDADD = \
@@ -38,4 +41,5 @@ transmission_create_LDADD = \
     @PTHREAD_LIBS@ \
     ${LIBM}
 transmission_edit_LDADD = $(transmission_create_LDADD)
+transmission_remote_LDADD = $(transmission_create_LDADD)
 transmission_show_LDADD = $(transmission_create_LDADD)

diff --git a/daemon/remote.c b/utils/remote.c
similarity index 100%
rename from daemon/remote.c
rename to utils/remote.c

diff --git a/daemon/transmission-remote.1 b/utils/transmission-remote.1
similarity index 100%
rename from daemon/transmission-remote.1
rename to utils/transmission-remote.1