From 9934c830e002884d546a36b586cec61405631206 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Thu, 23 Aug 2001 21:43:32 +0000
Subject: [PATCH] Moved buildno into tools directory

svn path=/trunk/; revision=2197
---
 reactos/Makefile                              | 23 +++-------------
 reactos/apps/utils/buildno/.cvsignore         |  2 --
 reactos/apps/utils/buildno/Makefile           | 26 -------------------
 reactos/tools/Makefile                        |  5 ++++
 .../{apps/utils/buildno => tools}/buildno.c   |  6 ++---
 5 files changed, 12 insertions(+), 50 deletions(-)
 delete mode 100644 reactos/apps/utils/buildno/.cvsignore
 delete mode 100644 reactos/apps/utils/buildno/Makefile
 rename reactos/{apps/utils/buildno => tools}/buildno.c (97%)

diff --git a/reactos/Makefile b/reactos/Makefile
index 4116a6607af..f37699dbb51 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -68,10 +68,10 @@ NET_APPS = ping roshttpd
 KERNEL_SERVICES = $(DEVICE_DRIVERS) $(INPUT_DRIVERS) $(FS_DRIVERS) \
 	$(NET_DRIVERS) $(NET_DEVICE_DRIVERS) $(STORAGE_DRIVERS)
 
-all: tools buildno dk $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
+all: tools dk $(COMPONENTS) $(HALS) $(BUS) $(DLLS) $(SUBSYS) \
      $(LOADERS) $(KERNEL_SERVICES) $(SYS_APPS) $(APPS) $(NET_APPS)
 
-clean: buildno_clean dk_clean $(HALS:%=%_clean) \
+clean: dk_clean $(HALS:%=%_clean) \
        $(COMPONENTS:%=%_clean) $(BUS:%=%_clean) $(DLLS:%=%_clean) \
        $(LOADERS:%=%_clean) $(KERNEL_SERVICES:%=%_clean) $(SUBSYS:%=%_clean) \
        $(SYS_APPS:%=%_clean) $(APPS:%=%_clean) $(NET_APPS:%=%_clean) clean_after tools_clean
@@ -79,8 +79,8 @@ clean: buildno_clean dk_clean $(HALS:%=%_clean) \
 clean_after:
 	$(RM) $(PATH_TO_TOP)/include/roscfg.h
 
-install: tools buildno install_dirs install_before \
-	       $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
+install: tools install_dirs install_before \
+         $(COMPONENTS:%=%_install) $(HALS:%=%_install) $(BUS:%=%_install) \
          $(DLLS:%=%_install) $(LOADERS:%=%_install) \
          $(KERNEL_SERVICES:%=%_install) $(SUBSYS:%=%_install) \
          $(SYS_APPS:%=%_install) $(APPS:%=%_install)
@@ -92,21 +92,6 @@ dist: $(TOOLS_PATH)/rcopy$(EXE_POSTFIX) dist_clean dist_dirs \
 
 .PHONY: all clean clean_before install dist
 
-#
-# Build number generator
-#
-buildno: include/reactos/version.h
-	make -C apps/buildno
-
-buildno_clean:
-	make -C apps/buildno clean
-
-buildno_dist:
-
-buildno_install:
-
-.PHONY: buildno buildno_clean buildno_dist buildno_install
-
 #
 # System Applications
 #
diff --git a/reactos/apps/utils/buildno/.cvsignore b/reactos/apps/utils/buildno/.cvsignore
deleted file mode 100644
index 446ae57105d..00000000000
--- a/reactos/apps/utils/buildno/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-buildno
-buildno.exe
diff --git a/reactos/apps/utils/buildno/Makefile b/reactos/apps/utils/buildno/Makefile
deleted file mode 100644
index 3113d3e03f2..00000000000
--- a/reactos/apps/utils/buildno/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: Makefile,v 1.10 2001/07/15 21:18:49 rex Exp $
-#
-
-PATH_TO_TOP = ../..
-
-BASE_CFLAGS = 
-TARGETNAME=buildno
-CLEAN_FILES= $(TARGETNAME).o $(TARGETNAME)$(EXE_POSTFIX) $(TARGETNAME).sym
-
-all: $(TARGETNAME)$(EXE_POSTFIX)
-	$(EXE_PREFIX)$(TARGETNAME)$(EXE_POSTFIX)
-
-
-$(TARGETNAME)$(EXE_POSTFIX): $(TARGETNAME).c ../../include/reactos/version.h
-	$(HOST_CC) -g -o $(TARGETNAME)$(EXE_POSTFIX) $(TARGETNAME).c
-
-
-
-clean:
-	- $(RM) $(CLEAN_FILES)
-
-.phony: clean 
-
-include ../../rules.mak
-
-# EOF
diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index 41fc43389d0..3bb0dd2489c 100644
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -1,6 +1,7 @@
 PATH_TO_TOP = ..
 
 TOOLS = \
+  buildno$(EXE_POSTFIX) \
   depends$(EXE_POSTFIX) \
   rcopy$(EXE_POSTFIX) \
   rdel$(EXE_POSTFIX) \
@@ -11,6 +12,10 @@ CLEAN_FILES = $(TOOLS)
 
 all: $(TOOLS)
 
+buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
+	$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
+	buildno$(EXE_POSTFIX)
+
 depends$(EXE_POSTFIX): depends.c
 	$(HOST_CC) $(CFLAGS) -o depends$(EXE_POSTFIX) depends.c
 
diff --git a/reactos/apps/utils/buildno/buildno.c b/reactos/tools/buildno.c
similarity index 97%
rename from reactos/apps/utils/buildno/buildno.c
rename to reactos/tools/buildno.c
index 0b39c471f94..868505bab75 100644
--- a/reactos/apps/utils/buildno/buildno.c
+++ b/reactos/tools/buildno.c
@@ -1,4 +1,4 @@
-/* $Id: buildno.c,v 1.6 2001/04/11 22:13:21 dwelch Exp $
+/* $Id: buildno.c,v 1.1 2001/08/23 21:41:35 ekohl Exp $
  *
  * buildno - Generate the build number for ReactOS
  *
@@ -36,13 +36,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "../../include/reactos/version.h"
+#include "../include/reactos/version.h"
 
 #define FALSE 0
 #define TRUE  1
 
 /* File to (over)write */
-#define BUILDNO_INCLUDE_FILE "../../include/reactos/buildno.h"
+#define BUILDNO_INCLUDE_FILE "../include/reactos/buildno.h"
 
 static char * argv0 = "";