[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-448-gce33885

[Lawrence S. <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  ce33885a8f23cc8e8cd970139b430591ea6c95fd (commit)
       via  ce9a738bf3819ac1cdf54b7181c6106628fdf1de (commit)
       via  84533739288de46e1cb4b3180d8d10545d83ba90 (commit)
      from  a2964cecf4d1acf19f208f5827eda952f8818b05 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce33885a8f23cc8e8cd970139b430591ea6c95fd
Merge: a2964ce ce9a738
Author: Lawrence Sebald <ljs...@us...>
Date:   Thu Aug 27 09:11:54 2020 -0400

    Merge pull request #45 from sizious/makeip-auto-build
    
    Build and install automatically makeip when building utils

commit ce9a738bf3819ac1cdf54b7181c6106628fdf1de
Author: SiZiOUS <si...@gm...>
Date:   Thu Aug 27 10:01:54 2020 +0200

    The makeip binary is now installed in the "${KOS_BASE}/utils/makeip" directory.
    This follow the same rule of all the other utilities provided by KOS.
    This avoid the installation outside the ${KOS_BASE} directory.

commit 84533739288de46e1cb4b3180d8d10545d83ba90
Author: SiZiOUS <si...@gm...>
Date:   Wed Aug 26 21:22:44 2020 +0200

    makeip is now automatically built and installed when running make in the utils directory

-----------------------------------------------------------------------

Summary of changes:
 utils/Makefile            |  2 +-
 utils/makeip/Makefile     | 10 ++++++++++
 utils/makeip/src/Makefile |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 utils/makeip/Makefile

diff --git a/utils/Makefile b/utils/Makefile
index 392c0d9..c00cad0 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -4,7 +4,7 @@
 # (c)2001 Dan Potter
 #
 
-DIRS = genromfs wav2adpcm vqenc scramble dcbumpgen
+DIRS = genromfs wav2adpcm vqenc scramble dcbumpgen makeip
 
 # Ok for these to fail atm...
 
diff --git a/utils/makeip/Makefile b/utils/makeip/Makefile
new file mode 100644
index 0000000..9927869
--- /dev/null
+++ b/utils/makeip/Makefile
@@ -0,0 +1,10 @@
+MAKE ?= make
+
+all:
+	@cd ./src; \
+	$(MAKE); \
+	$(MAKE) install
+
+clean:
+	@cd ./src; \
+	$(MAKE) clean
diff --git a/utils/makeip/src/Makefile b/utils/makeip/src/Makefile
index ff2c3f2..06e63fd 100644
--- a/utils/makeip/src/Makefile
+++ b/utils/makeip/src/Makefile
@@ -10,7 +10,7 @@ STRIP = strip
 CFLAGS = -O2 -Wall -DMAKEIP_VERSION=\"$(VERSION)\" -I/usr/local/include
 LDFLAGS = -L/usr/local/lib -lpng -lz
 
-INSTALLDIR = $(KOS_BASE)/../bin
+INSTALLDIR = ..
 
 EXECUTABLEEXTENSION =
 ifeq ($(shell echo $(OS)),Windows_NT)
@@ -27,7 +27,7 @@ $(TARGET): $(OBJECTS)
 
 install:
 	mkdir -p $(INSTALLDIR)
-	cp $(OUTPUT) $(INSTALLDIR)
+	mv $(OUTPUT) $(INSTALLDIR)
 
 .PHONY: clean
 clean:


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.