Browse Source

move apps to subdir

K. Lange 3 years ago
parent
commit
4d57ba0481
27 changed files with 14 additions and 14 deletions
  1. 14 14
      Makefile
  2. 0 0
      apps/background.c
  3. 0 0
      apps/cat.c
  4. 0 0
      apps/compositor.c
  5. 0 0
      apps/date.c
  6. 0 0
      apps/drawlines.c
  7. 0 0
      apps/echo.c
  8. 0 0
      apps/env.c
  9. 0 0
      apps/hello.c
  10. 0 0
      apps/hostname.c
  11. 0 0
      apps/init.c
  12. 0 0
      apps/kdebug.c
  13. 0 0
      apps/kill.c
  14. 0 0
      apps/ls.c
  15. 0 0
      apps/mount.c
  16. 0 0
      apps/nyancat/animation.h
  17. 0 0
      apps/nyancat/nyancat.c
  18. 0 0
      apps/nyancat/telnet.h
  19. 0 0
      apps/ps.c
  20. 0 0
      apps/pstree.c
  21. 0 0
      apps/session.c
  22. 0 0
      apps/sh.c
  23. 0 0
      apps/sysinfo.c
  24. 0 0
      apps/terminal.c
  25. 0 0
      apps/uname.c
  26. 0 0
      apps/yutani-query.c
  27. 0 0
      apps/yutani-test.c

+ 14 - 14
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

background.c → apps/background.c


cat.c → apps/cat.c


compositor.c → apps/compositor.c


date.c → apps/date.c


drawlines.c → apps/drawlines.c


echo.c → apps/echo.c


env.c → apps/env.c


hello.c → apps/hello.c


hostname.c → apps/hostname.c


init.c → apps/init.c


kdebug.c → apps/kdebug.c


kill.c → apps/kill.c


ls.c → apps/ls.c


mount.c → apps/mount.c


nyancat/animation.h → apps/nyancat/animation.h


nyancat/nyancat.c → apps/nyancat/nyancat.c


nyancat/telnet.h → apps/nyancat/telnet.h


ps.c → apps/ps.c


pstree.c → apps/pstree.c


session.c → apps/session.c


sh.c → apps/sh.c


sysinfo.c → apps/sysinfo.c


terminal.c → apps/terminal.c


uname.c → apps/uname.c


yutani-query.c → apps/yutani-query.c


yutani-test.c → apps/yutani-test.c