make rule for user header file install

[lunaix-os.git] / lunaix-os / makefile

diff --git a/lunaix-os/makefile b/lunaix-os/makefile
index 9895780868e743be2f6d6d8e3376899706df1a66..5d6d2af897512b574a17f21f3772dd2290a90198 100644 (file)
--- a/lunaix-os/makefile
+++ b/lunaix-os/makefile
@@ -34,6 +34,8 @@ $(kbuild_dir):
        @mkdir -p $(os_img_dir)/usr
 
 .PHONY: kernel
        @mkdir -p $(os_img_dir)/usr
 
 .PHONY: kernel

+.PHONY: rootfs all clean-user clean tool
+

 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
 kernel: $(lbuild_mkinc)
 export BUILD_DIR=$(kbin_dir)
 export BUILD_NAME=$(kbin)
 kernel: $(lbuild_mkinc)


@@ -41,32 +43,32 @@ kernel: $(lbuild_mkinc)
 
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 
 
        @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f kernel.mk all
 

-.PHONY: rootfs all clean-user clean tool
-
-tool:
-       $(call status,TASK,$@)
-       @$(MAKE) $(MKFLAGS) -C scripts all -I $(mkinc_dir)
-

 .NOTPARALLEL:
 export LBUILD ARCH MODE
 all: $(kbuild_dir) tool kernel
 
 .NOTPARALLEL:
 export LBUILD ARCH MODE
 all: $(kbuild_dir) tool kernel
 

-rootfs: usr/build
-       $(call status,TASK,$(notdir $@))
-       @./scripts/mkrootfs
+# --- begin stock user --- #

 
 

-usr/build: user
-
-prepare: $(os_img_dir)
+export PREFIX=usr/includes
+usr/includes: install-header

 
 export LBUILD ARCH MODE
 
 export LBUILD ARCH MODE

-user:
+user: usr/includes

        $(call status,TASK,$@)
        @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
 
 clean-user:
        @$(MAKE) -C usr clean -I $(mkinc_dir)
 
        $(call status,TASK,$@)
        @$(MAKE) $(MKFLAGS) -C usr all -I $(mkinc_dir)
 
 clean-user:
        @$(MAKE) -C usr clean -I $(mkinc_dir)
 

+rootfs: usr/build
+       $(call status,TASK,$(notdir $@))
+       @./scripts/mkrootfs
+
+usr/build: user
+
+# --- end stock user --- #
+
+

 clean:
        @$(MAKE) $(MKFLAGS) -C usr clean -I $(mkinc_dir)
        @$(MAKE) $(MKFLAGS) -C scripts clean -I $(mkinc_dir)
 clean:
        @$(MAKE) $(MKFLAGS) -C usr clean -I $(mkinc_dir)
        @$(MAKE) $(MKFLAGS) -C scripts clean -I $(mkinc_dir)


@@ -76,6 +78,18 @@ clean:
        @rm -rf $(kbuild_dir) || exit 1
        @rm -rf .builder || exit 1
 
        @rm -rf $(kbuild_dir) || exit 1
        @rm -rf .builder || exit 1
 

+
+# --- begin misc --- #
+

 export CFLAGS=-include $(lbuild_config_h)
 unit-test: $(lbuild_config_h)
 export CFLAGS=-include $(lbuild_config_h)
 unit-test: $(lbuild_config_h)

-       @$(MAKE) $(MKFLAGS) -C tests/units run 
\ No newline at end of file
+       @$(MAKE) $(MKFLAGS) -C tests/units run 
+
+tool:
+       $(call status,TASK,$@)
+       @$(MAKE) $(MKFLAGS) -C scripts all -I $(mkinc_dir)
+
+install-header:
+       @$(MAKE) $(MKFLAGS) -I $(mkinc_dir) -f install_headers.mk all
+
+# --- end misc --- #
\ No newline at end of file