reorganized folder structure

diff --git a/Makefile b/Makefile
index 5c64912b28011aa252fa1c057ecff6baaad52974..20ba0343d1c928b7cc6a1c79291e0561e11016ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all libs bins clean
+.PHONY: all libs bins rules clean
 
 all: libs bins
 
@@ -8,9 +8,11 @@ clean:
 
 bins: libs
 
+rules: rules.mk
+
 include config.mk
 
 rules.mk:
-       ./genrules.sh $(OUTDIR)
+       ./mkrules $(OUTDIR)
 include rules.mk
 include bin/rules.mk

diff --git a/bin/winmgr.c b/bin/winmgr/main.c
similarity index 79%
rename from bin/winmgr.c
rename to bin/winmgr/main.c
index cbfdb1c54dad327ce77458d25d3268bcbaddbe3c..d2b68a7ee6c0b1be5e224981ab0c8e45bf7bbd19 100644 (file)
--- a/bin/winmgr.c
+++ b/bin/winmgr/main.c
@@ -1,6 +1,8 @@
+#include <liba.h>
+
 int main(int argc, char** argv)
 {
     (void)argc;
     (void)argv;
     return 0;
-}
\ No newline at end of file
+}

diff --git a/genrules.sh b/genrules.sh
deleted file mode 100755 (executable)
index 6a58c6d..0000000
--- a/genrules.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-OUTDIR="$1"
-
-printf "" > rules.mk
-libs=""
-{
-    mkdir -p "$OUTDIR/bin/"
-    mkdir -p "$OUTDIR/lib/"
-
-    # Generate rules for all libraries
-    for lib in lib/*; do
-        libdir="$(dirname "$lib")"
-        libname="$(basename "$lib")"
-        libs="$libs \$(OUTDIR)/$libdir/lib$libname.a"
-        mkdir -p "$OUTDIR/$lib/"
-        for f in "$lib"/*; do
-            printf "%s\n" "\$(OUTDIR)/${f%.c}.o: $f config.mk"
-            printf "\t\$(OBJECT)\n"
-            printf "%s\n" "\$(OUTDIR)/$libdir/lib$libname.a: \$(OUTDIR)/${f%.c}.o"
-            printf "%sinclude %s\n" '-' "\$(OUTDIR)/${f%.c}.d"
-        done
-        printf "%s\n"   "\$(OUTDIR)/$libdir/lib$libname.a:"
-        printf "\t\$(ARCHIVE)\n"
-        printf "%s\n"  "libs: \$(OUTDIR)/$libdir/lib$libname.a"
-    done
-    printf "libs = %s\n" "$libs"
-
-    # Generate rules for simple binaries
-    for bin in bin/*.c; do
-        printf "%s\n" "\$(OUTDIR)/${bin%.c}.o: $bin"
-        printf "\t\$(OBJECT)\n"
-        printf "%s\n" "\$(OUTDIR)/${bin%.c}: \$(OUTDIR)/${bin%.c}.o \$(libs)"
-        printf "\t\$(BINARY)\n"
-        printf "%s\n" "bins: \$(OUTDIR)/${bin%.c}"
-    done
-} >> rules.mk

diff --git a/lib/a/Options_Parse.c b/lib/a/Options.c
similarity index 100%
rename from lib/a/Options_Parse.c
rename to lib/a/Options.c

diff --git a/lib/a/argv0.c b/lib/a/defaults/argv0.c
similarity index 100%
rename from lib/a/argv0.c
rename to lib/a/defaults/argv0.c

diff --git a/lib/a/options.c b/lib/a/defaults/options.c
similarity index 100%
rename from lib/a/options.c
rename to lib/a/defaults/options.c

diff --git a/lib/a/set_option.c b/lib/a/defaults/set_option.c
similarity index 100%
rename from lib/a/set_option.c
rename to lib/a/defaults/set_option.c

diff --git a/lib/a/usage.c b/lib/a/defaults/usage.c
similarity index 100%
rename from lib/a/usage.c
rename to lib/a/defaults/usage.c

diff --git a/lib/a/ecalloc.c b/lib/a/stdlib/ecalloc.c
similarity index 100%
rename from lib/a/ecalloc.c
rename to lib/a/stdlib/ecalloc.c

diff --git a/lib/a/efopen.c b/lib/a/stdlib/efopen.c
similarity index 100%
rename from lib/a/efopen.c
rename to lib/a/stdlib/efopen.c

diff --git a/lib/a/efreadline.c b/lib/a/stdlib/efreadline.c
similarity index 100%
rename from lib/a/efreadline.c
rename to lib/a/stdlib/efreadline.c

diff --git a/lib/a/emalloc.c b/lib/a/stdlib/emalloc.c
similarity index 100%
rename from lib/a/emalloc.c
rename to lib/a/stdlib/emalloc.c

diff --git a/lib/a/eraise.c b/lib/a/stdlib/eraise.c
similarity index 100%
rename from lib/a/eraise.c
rename to lib/a/stdlib/eraise.c

diff --git a/lib/a/erealloc.c b/lib/a/stdlib/erealloc.c
similarity index 100%
rename from lib/a/erealloc.c
rename to lib/a/stdlib/erealloc.c

diff --git a/lib/a/esignal.c b/lib/a/stdlib/esignal.c
similarity index 100%
rename from lib/a/esignal.c
rename to lib/a/stdlib/esignal.c

diff --git a/lib/a/estrdup.c b/lib/a/stdlib/estrdup.c
similarity index 100%
rename from lib/a/estrdup.c
rename to lib/a/stdlib/estrdup.c

diff --git a/lib/a/fatal.c b/lib/a/stdlib/fatal.c
similarity index 100%
rename from lib/a/fatal.c
rename to lib/a/stdlib/fatal.c

diff --git a/lib/a/forkexec.c b/lib/a/stdlib/forkexec.c
similarity index 100%
rename from lib/a/forkexec.c
rename to lib/a/stdlib/forkexec.c

diff --git a/lib/a/smprintf.c b/lib/a/stdlib/smprintf.c
similarity index 100%
rename from lib/a/smprintf.c
rename to lib/a/stdlib/smprintf.c

diff --git a/lib/a/strmcat.c b/lib/a/stdlib/strmcat.c
similarity index 100%
rename from lib/a/strmcat.c
rename to lib/a/stdlib/strmcat.c

diff --git a/lib/a/warn.c b/lib/a/stdlib/warn.c
similarity index 100%
rename from lib/a/warn.c
rename to lib/a/stdlib/warn.c