Skip to content
Snippets Groups Projects
Commit 4e7e0668 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

remove 66-info,regress for now at previous state at gen-deps.sh

parent 4929c6f2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
package/deps.mak
+ 46
− 47
View file @ 4e7e0668
......@@ -21,7 +21,6 @@ src/66/66-disable.o src/66/66-disable.lo: src/66/66-disable.c src/include/66/sse
src/66/66-enable.o src/66/66-enable.lo: src/66/66-enable.c src/include/66/ssexec.h
src/66/66-env.o src/66/66-env.lo: src/66/66-env.c src/include/66/ssexec.h
src/66/66-hpr.o src/66/66-hpr.lo: src/66/66-hpr.c src/include/66/config.h src/include/66/hpr.h
src/66/66-info.o src/66/66-info.lo: src/66/66-info.c
src/66/66-init.o src/66/66-init.lo: src/66/66-init.c src/include/66/ssexec.h
src/66/66-inservice.o src/66/66-inservice.lo: src/66/66-inservice.c src/include/66/constants.h src/include/66/enum.h src/include/66/environ.h src/include/66/info.h src/include/66/resolve.h src/include/66/tree.h src/include/66/utils.h
src/66/66-intree.o src/66/66-intree.lo: src/66/66-intree.c src/include/66/backup.h src/include/66/constants.h src/include/66/enum.h src/include/66/info.h src/include/66/resolve.h src/include/66/tree.h src/include/66/utils.h
......@@ -98,52 +97,52 @@ src/lib66/tree_sethome.o src/lib66/tree_sethome.lo: src/lib66/tree_sethome.c src
src/lib66/tree_setname.o src/lib66/tree_setname.lo: src/lib66/tree_setname.c src/include/66/tree.h
src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree_switch_current.c src/include/66/config.h src/include/66/constants.h src/include/66/tree.h src/include/66/utils.h
66-all: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-all: src/66/66-all.o ${LIB66}
66-boot: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-boot: src/66/66-boot.o ${LIB66}
66-dbctl: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB} ${SPAWN_LIB}
66-dbctl: src/66/66-dbctl.o ${LIB66}
66-disable: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-disable: src/66/66-disable.o ${LIB66}
66-enable: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-enable: src/66/66-enable.o ${LIB66}
66-env: EXTRA_LIBS := -loblibs -lskarnet
66-env: src/66/66-env.o ${LIB66}
66-hpr: EXTRA_LIBS := -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-hpr: src/66/66-hpr.o ${LIB66} ${LIBUTMPS}
66-info: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-info: src/66/66-info.o ${LIB66}
66-init: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-init: src/66/66-init.o ${LIB66}
66-inservice: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-inservice: src/66/66-inservice.o ${LIB66}
66-intree: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-intree: src/66/66-intree.o ${LIB66}
66-parser: EXTRA_LIBS := -loblibs -lskarnet
66-parser: src/66/66-parser.o ${LIB66}
66-scanctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-scanctl: src/66/66-scanctl.o ${LIB66}
66-scandir: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-scandir: src/66/66-scandir.o ${LIB66}
66-shutdown: EXTRA_LIBS := -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-shutdown: src/66/66-shutdown.o ${LIB66} ${LIBUTMPS}
66-shutdownd: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-shutdownd: src/66/66-shutdownd.o ${LIB66} ${LIBUTMPS}
66-start: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-start: src/66/66-start.o ${LIB66}
66-stop: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-stop: src/66/66-stop.o ${LIB66}
66-svctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB}
66-svctl: src/66/66-svctl.o ${LIB66}
66-tree: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-tree: src/66/66-tree.o ${LIB66}
66-update: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-update: src/66/66-update.o ${LIB66}
66-echo: EXTRA_LIBS := -loblibs -lskarnet
66-echo: src/extra-tools/66-echo.o
66-umountall: EXTRA_LIBS := -loblibs -lskarnet
66-umountall: src/extra-tools/66-umountall.o
66-all: EXTRA_LIBS := ${SPAWN_LIB}
66-all: src/66/66-all.o ${LIB66} -ls6 -loblibs -lskarnet
66-boot: EXTRA_LIBS := ${SPAWN_LIB}
66-boot: src/66/66-boot.o ${LIB66} -ls6 -loblibs -lskarnet
66-dbctl: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SPAWN_LIB}
66-dbctl: src/66/66-dbctl.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-disable: EXTRA_LIBS :=
66-disable: src/66/66-disable.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-enable: EXTRA_LIBS :=
66-enable: src/66/66-enable.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-env: EXTRA_LIBS :=
66-env: src/66/66-env.o ${LIB66} -loblibs -lskarnet
66-hpr: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-hpr: src/66/66-hpr.o ${LIB66} ${LIBUTMPS} -loblibs -lskarnet
66-info: EXTRA_LIBS :=
66-info: src/66/66-info.o ${LIB66} -ls6 -loblibs -lskarnet
66-init: EXTRA_LIBS :=
66-init: src/66/66-init.o ${LIB66} -ls6 -loblibs -lskarnet
66-inservice: EXTRA_LIBS := ${SPAWN_LIB}
66-inservice: src/66/66-inservice.o ${LIB66} -ls6 -loblibs -lskarnet
66-intree: EXTRA_LIBS :=
66-intree: src/66/66-intree.o ${LIB66} -ls6 -loblibs -lskarnet
66-parser: EXTRA_LIBS :=
66-parser: src/66/66-parser.o ${LIB66} -loblibs -lskarnet
66-scanctl: EXTRA_LIBS :=
66-scanctl: src/66/66-scanctl.o ${LIB66} -ls6 -loblibs -lskarnet
66-scandir: EXTRA_LIBS :=
66-scandir: src/66/66-scandir.o ${LIB66} -ls6 -loblibs -lskarnet
66-shutdown: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-shutdown: src/66/66-shutdown.o ${LIB66} ${LIBUTMPS} -loblibs -lskarnet
66-shutdownd: EXTRA_LIBS := ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-shutdownd: src/66/66-shutdownd.o ${LIB66} -ls6 -loblibs ${LIBUTMPS} -lskarnet
66-start: EXTRA_LIBS :=
66-start: src/66/66-start.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-stop: EXTRA_LIBS :=
66-stop: src/66/66-stop.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-svctl: EXTRA_LIBS := ${SYSCLOCK_LIB}
66-svctl: src/66/66-svctl.o ${LIB66} -ls6 -loblibs -lskarnet
66-tree: EXTRA_LIBS := ${SPAWN_LIB}
66-tree: src/66/66-tree.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-update: EXTRA_LIBS :=
66-update: src/66/66-update.o ${LIB66} -ls6rc -ls6 -loblibs -lskarnet
66-echo: EXTRA_LIBS :=
66-echo: src/extra-tools/66-echo.o -loblibs -lskarnet
66-umountall: EXTRA_LIBS :=
66-umountall: src/extra-tools/66-umountall.o -loblibs -lskarnet
ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
lib66.a.xyzzy: src/lib66/backup_cmd_switcher.o src/lib66/backup_make_new.o src/lib66/backup_realpath_sym.o src/lib66/db_compile.o src/lib66/db_find_compiled_state.o src/lib66/db_ok.o src/lib66/db_switch_to.o src/lib66/db_update.o src/lib66/environ.o src/lib66/get_enum.o src/lib66/get_uidgid.o src/lib66/get_userhome.o src/lib66/hpr_shutdown.o src/lib66/hpr_wall.o src/lib66/instance.o src/lib66/parser.o src/lib66/parser_enabled.o src/lib66/parser_utils.o src/lib66/parser_write.o src/lib66/rc_init.o src/lib66/rc_manage.o src/lib66/rc_send.o src/lib66/rc_unsupervise.o src/lib66/resolve.o src/lib66/resolve_graph.o src/lib66/scandir_ok.o src/lib66/scandir_send_signal.o src/lib66/set_livedir.o src/lib66/set_livescan.o src/lib66/set_livestate.o src/lib66/set_livetree.o src/lib66/set_ownerhome.o src/lib66/set_ownersysdir.o src/lib66/ss_info_utils.o src/lib66/ssexec_dbctl.o src/lib66/ssexec_enable.o src/lib66/ssexec_env.o src/lib66/ssexec_disable.o src/lib66/ssexec_free.o src/lib66/ssexec_help.o src/lib66/ssexec_init.o src/lib66/ssexec_main.o src/lib66/ssexec_start.o src/lib66/ssexec_stop.o src/lib66/ssexec_svctl.o src/lib66/state.o src/lib66/sv_alltype_zero.o src/lib66/svc_init.o src/lib66/svc_init_pipe.o src/lib66/svc_send.o src/lib66/svc_switch_to.o src/lib66/svc_unsupervise.o src/lib66/tree_cmd_state.o src/lib66/tree_copy.o src/lib66/tree_copy_tmp.o src/lib66/tree_find_current.o src/lib66/tree_get_permissions.o src/lib66/tree_sethome.o src/lib66/tree_setname.o src/lib66/tree_switch_current.o
else
......
package/targets.mak
+ 0
− 1
View file @ 4e7e0668
......@@ -11,7 +11,6 @@ BIN_TARGETS := \
66-stop \
66-svctl \
66-all \
66-info \
66-intree \
66-inservice \
66-env \
......
src/66/66-info.c deleted 100644 → 0
+ 0
− 66
View file @ 4929c6f2
/*
* 66-info.c
*
* Copyright (c) 2018-2020 Eric Vidal <eric@obarun.org>
*
* All rights reserved.
*
* This file is part of Obarun. It is subject to the license terms in
* the LICENSE file found in the top-level directory of this
* distribution.
* This file may not be copied, modified, propagated, or distributed
* except according to the terms contained in the LICENSE file./
*/
#include <oblibs/obgetopt.h>
#include <oblibs/log.h>
#include <skalibs/buffer.h>
#define USAGE "66-info is deprecated -- use 66-intree for tree informations or 66-inservice for service informations"
static inline void info_help (void)
{
static char const *help =
"66-info is deprecated -- use 66-intree for tree informations or 66-inservice for service informations\n"
;
if (buffer_putsflush(buffer_1, help) < 0)
log_dieusys(LOG_EXIT_SYS, "write to stdout") ;
}
int main(int argc, char const *const *argv, char const *const *envp)
{
int what ;
what = -1 ;
PROG = "66-info" ;
{
subgetopt_t l = SUBGETOPT_ZERO ;
for (;;)
{
int opt = getopt_args(2,argv, ">hTS", &l) ;
if (opt == -1) break ;
if (opt == -2) log_die(LOG_EXIT_USER,"options must be set first") ;
switch (opt)
{
case 'h' : info_help(); return 0 ;
case 'T' : what = 0 ; break ;
case 'S' : what = 1 ; break ;
default : log_usage(USAGE) ;
}
}
}
if (what == -1) log_usage(USAGE) ;
if (!what) {
log_info("66-info is deprecated -- use 66-intree instead") ;
}
else if (what) {
log_info("66-info is deprecated -- use 66-inservice instead") ;
}
return 0 ;
}
tools/gen-deps.sh
+ 1
− 1
View file @ 4e7e0668
......@@ -81,7 +81,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
if echo $dep | grep -q -- \\.o$ ; then
dep="src/$dir/$dep"
fi
if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
if echo $dep | grep -q -- '^\${.*_LIB}' ; then
libs="$libs $dep"
else
deps="$deps $dep"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment