From 4d57ba0481c08aefa71aa388cd91fbf589040754 Mon Sep 17 00:00:00 2001 From: "K. Lange" Date: Sat, 3 Mar 2018 20:53:13 +0900 Subject: [PATCH] move apps to subdir --- Makefile | 28 +++++++++++++-------------- background.c => apps/background.c | 0 cat.c => apps/cat.c | 0 compositor.c => apps/compositor.c | 0 date.c => apps/date.c | 0 drawlines.c => apps/drawlines.c | 0 echo.c => apps/echo.c | 0 env.c => apps/env.c | 0 hello.c => apps/hello.c | 0 hostname.c => apps/hostname.c | 0 init.c => apps/init.c | 0 kdebug.c => apps/kdebug.c | 0 kill.c => apps/kill.c | 0 ls.c => apps/ls.c | 0 mount.c => apps/mount.c | 0 {nyancat => apps/nyancat}/animation.h | 0 {nyancat => apps/nyancat}/nyancat.c | 0 {nyancat => apps/nyancat}/telnet.h | 0 ps.c => apps/ps.c | 0 pstree.c => apps/pstree.c | 0 session.c => apps/session.c | 0 sh.c => apps/sh.c | 0 sysinfo.c => apps/sysinfo.c | 0 terminal.c => apps/terminal.c | 0 uname.c => apps/uname.c | 0 yutani-query.c => apps/yutani-query.c | 0 yutani-test.c => apps/yutani-test.c | 0 27 files changed, 14 insertions(+), 14 deletions(-) rename background.c => apps/background.c (100%) rename cat.c => apps/cat.c (100%) rename compositor.c => apps/compositor.c (100%) rename date.c => apps/date.c (100%) rename drawlines.c => apps/drawlines.c (100%) rename echo.c => apps/echo.c (100%) rename env.c => apps/env.c (100%) rename hello.c => apps/hello.c (100%) rename hostname.c => apps/hostname.c (100%) rename init.c => apps/init.c (100%) rename kdebug.c => apps/kdebug.c (100%) rename kill.c => apps/kill.c (100%) rename ls.c => apps/ls.c (100%) rename mount.c => apps/mount.c (100%) rename {nyancat => apps/nyancat}/animation.h (100%) rename {nyancat => apps/nyancat}/nyancat.c (100%) rename {nyancat => apps/nyancat}/telnet.h (100%) rename ps.c => apps/ps.c (100%) rename pstree.c => apps/pstree.c (100%) rename session.c => apps/session.c (100%) rename sh.c => apps/sh.c (100%) rename sysinfo.c => apps/sysinfo.c (100%) rename terminal.c => apps/terminal.c (100%) rename uname.c => apps/uname.c (100%) rename yutani-query.c => apps/yutani-query.c (100%) rename yutani-test.c => apps/yutani-test.c (100%) diff --git a/Makefile b/Makefile index d2d7769c..96c72253 100644 --- a/Makefile +++ b/Makefile @@ -77,46 +77,46 @@ base/lib/libtoaru_decorations.so: lib/decorations.c lib/decorations.h base/lib/l base/lib/libtoaru-decor-fancy.so: decors/decor-fancy.c lib/decorations.h base/lib/libtoaru_graphics.so base/lib/libtoaru_decorations.so base/lib/libtoaru_drawstring.so $(CC) -o $@ $(CFLAGS) -shared -fPIC $< -ltoaru_decorations -ltoaru_drawstring -ltoaru_graphics -base/bin/init: init.c base/lib/libnihc.a | dirs +base/bin/init: apps/init.c base/lib/libnihc.a | dirs $(CC) -static -Wl,-static $(CFLAGS) -o $@ $< $(LIBS) -base/bin/sh: sh.c base/lib/libnihc.so base/lib/libtoaru_list.so base/lib/libtoaru_rline.so +base/bin/sh: apps/sh.c base/lib/libnihc.so base/lib/libtoaru_list.so base/lib/libtoaru_rline.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_rline -ltoaru_list -ltoaru_kbd $(LIBS) -base/bin/sysinfo: sysinfo.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_termemu.so +base/bin/sysinfo: apps/sysinfo.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_termemu.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_graphics -ltoaru_termemu $(LIBS) -base/bin/terminal: terminal.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_decorations.so base/lib/libtoaru_dlfcn.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_termemu.so base/lib/libtoaru_pex.so base/lib/libtoaru_hashmap.so +base/bin/terminal: apps/terminal.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_decorations.so base/lib/libtoaru_dlfcn.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_termemu.so base/lib/libtoaru_pex.so base/lib/libtoaru_hashmap.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_termemu -ltoaru_decorations -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_hashmap -ltoaru_dlfcn -ltoaru_kbd -ltoaru_list $(LIBS) -base/bin/background: background.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so base/lib/libtoaru_drawstring.so +base/bin/background: apps/background.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so base/lib/libtoaru_drawstring.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_drawstring -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_pthread -ltoaru_hashmap -ltoaru_list $(LIBS) -base/bin/drawlines: drawlines.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so +base/bin/drawlines: apps/drawlines.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_pthread -ltoaru_hashmap -ltoaru_list $(LIBS) -base/bin/yutani-query: yutani-query.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so +base/bin/yutani-query: apps/yutani-query.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_pthread -ltoaru_hashmap -ltoaru_list $(LIBS) -base/bin/yutani-test: yutani-test.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so +base/bin/yutani-test: apps/yutani-test.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_yutani.so base/lib/libtoaru_pthread.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_yutani -ltoaru_graphics -ltoaru_pex -ltoaru_pthread -ltoaru_hashmap -ltoaru_list $(LIBS) -base/bin/compositor: compositor.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_pthread.so base/lib/libtoaru_pex.so base/lib/libtoaru_yutani.so base/lib/libtoaru_hashmap.so +base/bin/compositor: apps/compositor.c base/lib/libnihc.so base/lib/libtoaru_graphics.so base/lib/libtoaru_list.so base/lib/libtoaru_kbd.so base/lib/libtoaru_pthread.so base/lib/libtoaru_pex.so base/lib/libtoaru_yutani.so base/lib/libtoaru_hashmap.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_yutani -ltoaru_pthread -ltoaru_pex -ltoaru_graphics -ltoaru_kbd -ltoaru_hashmap -ltoaru_list $(LIBS) -base/bin/ls: ls.c base/lib/libnihc.so base/lib/libtoaru_list.so +base/bin/ls: apps/ls.c base/lib/libnihc.so base/lib/libtoaru_list.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_list $(LIBS) -base/bin/nyancat: nyancat/nyancat.c base/lib/libnihc.so +base/bin/nyancat: apps/nyancat/nyancat.c base/lib/libnihc.so $(CC) $(CFLAGS) -o $@ $< $(LIBS) -base/bin/ps: ps.c base/lib/libnihc.so base/lib/libtoaru_list.so +base/bin/ps: apps/ps.c base/lib/libnihc.so base/lib/libtoaru_list.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_list $(LIBS) -base/bin/pstree: pstree.c base/lib/libnihc.so base/lib/libtoaru_tree.so base/lib/libtoaru_list.so +base/bin/pstree: apps/pstree.c base/lib/libnihc.so base/lib/libtoaru_tree.so base/lib/libtoaru_list.so $(CC) $(CFLAGS) -o $@ $< -ltoaru_tree -ltoaru_list $(LIBS) -base/bin/%: %.c base/lib/libnihc.so | dirs +base/bin/%: apps/%.c base/lib/libnihc.so | dirs $(CC) $(CFLAGS) -o $@ $< $(LIBS) cdrom/ramdisk.img.gz: ${APPS_X} base/lib/ld.so base/lib/libtoaru-decor-fancy.so | dirs diff --git a/background.c b/apps/background.c similarity index 100% rename from background.c rename to apps/background.c diff --git a/cat.c b/apps/cat.c similarity index 100% rename from cat.c rename to apps/cat.c diff --git a/compositor.c b/apps/compositor.c similarity index 100% rename from compositor.c rename to apps/compositor.c diff --git a/date.c b/apps/date.c similarity index 100% rename from date.c rename to apps/date.c diff --git a/drawlines.c b/apps/drawlines.c similarity index 100% rename from drawlines.c rename to apps/drawlines.c diff --git a/echo.c b/apps/echo.c similarity index 100% rename from echo.c rename to apps/echo.c diff --git a/env.c b/apps/env.c similarity index 100% rename from env.c rename to apps/env.c diff --git a/hello.c b/apps/hello.c similarity index 100% rename from hello.c rename to apps/hello.c diff --git a/hostname.c b/apps/hostname.c similarity index 100% rename from hostname.c rename to apps/hostname.c diff --git a/init.c b/apps/init.c similarity index 100% rename from init.c rename to apps/init.c diff --git a/kdebug.c b/apps/kdebug.c similarity index 100% rename from kdebug.c rename to apps/kdebug.c diff --git a/kill.c b/apps/kill.c similarity index 100% rename from kill.c rename to apps/kill.c diff --git a/ls.c b/apps/ls.c similarity index 100% rename from ls.c rename to apps/ls.c diff --git a/mount.c b/apps/mount.c similarity index 100% rename from mount.c rename to apps/mount.c diff --git a/nyancat/animation.h b/apps/nyancat/animation.h similarity index 100% rename from nyancat/animation.h rename to apps/nyancat/animation.h diff --git a/nyancat/nyancat.c b/apps/nyancat/nyancat.c similarity index 100% rename from nyancat/nyancat.c rename to apps/nyancat/nyancat.c diff --git a/nyancat/telnet.h b/apps/nyancat/telnet.h similarity index 100% rename from nyancat/telnet.h rename to apps/nyancat/telnet.h diff --git a/ps.c b/apps/ps.c similarity index 100% rename from ps.c rename to apps/ps.c diff --git a/pstree.c b/apps/pstree.c similarity index 100% rename from pstree.c rename to apps/pstree.c diff --git a/session.c b/apps/session.c similarity index 100% rename from session.c rename to apps/session.c diff --git a/sh.c b/apps/sh.c similarity index 100% rename from sh.c rename to apps/sh.c diff --git a/sysinfo.c b/apps/sysinfo.c similarity index 100% rename from sysinfo.c rename to apps/sysinfo.c diff --git a/terminal.c b/apps/terminal.c similarity index 100% rename from terminal.c rename to apps/terminal.c diff --git a/uname.c b/apps/uname.c similarity index 100% rename from uname.c rename to apps/uname.c diff --git a/yutani-query.c b/apps/yutani-query.c similarity index 100% rename from yutani-query.c rename to apps/yutani-query.c diff --git a/yutani-test.c b/apps/yutani-test.c similarity index 100% rename from yutani-test.c rename to apps/yutani-test.c