From b1d7638f546c9806bbca167936adc4437abd6d47 Mon Sep 17 00:00:00 2001
From: Crayon2000 <crayon1@rocketmail.com>
Date: Sun, 1 Nov 2015 22:16:58 -0500
Subject: [PATCH] Including devkitPPC base rules in makefiles.

---
 GRRLIB/GRRLIB/Makefile                     | 9 ++-------
 GRRLIB/lib/freetype/builds/compiler/wii.mk | 4 ++--
 GRRLIB/lib/jpeg/Makefile                   | 7 +------
 GRRLIB/lib/png/Makefile                    | 7 +------
 GRRLIB/lib/pngu/Makefile                   | 7 +------
 GRRLIB/lib/zlib/Makefile                   | 7 +------
 6 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/GRRLIB/GRRLIB/Makefile b/GRRLIB/GRRLIB/Makefile
index fff8cdc..690c947 100644
--- a/GRRLIB/GRRLIB/Makefile
+++ b/GRRLIB/GRRLIB/Makefile
@@ -10,13 +10,11 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
 endif
 
+include $(DEVKITPPC)/base_rules
+
 NULLSTR :=
 PWD     := $(subst $(NULLSTR) ,\ ,$(shell pwd))
 
-PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
-CC		:=	$(PREFIX)gcc
-AR		:=	$(PREFIX)ar
-
 LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
 LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
 
@@ -42,6 +40,3 @@ install :
 	cp -f $(ARC) $(LIBOGC_LIB)/
 	cp -f $(HDR) $(LIBOGC_INC)/
 	cp -f $(INL) $(LIBOGC_INC)/grrlib
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/freetype/builds/compiler/wii.mk b/GRRLIB/lib/freetype/builds/compiler/wii.mk
index 88a0319..93d86c2 100644
--- a/GRRLIB/lib/freetype/builds/compiler/wii.mk
+++ b/GRRLIB/lib/freetype/builds/compiler/wii.mk
@@ -9,10 +9,11 @@
 # indicate that you have read the license and understand and accept it
 # fully.
 
+# devkitPPC base rules
+include $(DEVKITPPC)/base_rules
 
 # Compiler command line name
 #
-CC           := $(DEVKITPPC)/bin/powerpc-eabi-gcc
 COMPILER_SEP := $(SEP)
 
 
@@ -72,7 +73,6 @@ ANSIFLAGS :=
 # Library linking
 #
 CLEAN_LIBRARY ?= $(DELETE) $(subst /,$(SEP),$(PROJECT_LIBRARY))
-AR            := $(DEVKITPPC)/bin/powerpc-eabi-ar
 LINK_LIBRARY   = $(AR) -r $@ $(subst /,$(COMPILER_SEP),$(OBJECTS_LIST))
 
 
diff --git a/GRRLIB/lib/jpeg/Makefile b/GRRLIB/lib/jpeg/Makefile
index 8dbe54d..db31d91 100644
--- a/GRRLIB/lib/jpeg/Makefile
+++ b/GRRLIB/lib/jpeg/Makefile
@@ -10,9 +10,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
 endif
 
-PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
-CC		:=	$(PREFIX)gcc
-AR		:=	$(PREFIX)ar
+include $(DEVKITPPC)/base_rules
 
 LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
 LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
@@ -37,6 +35,3 @@ install :
 	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
 	cp -f $(ARC) $(LIBOGC_LIB)/
 	cp -f $(HDR) $(LIBOGC_INC)/
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/png/Makefile b/GRRLIB/lib/png/Makefile
index 01dea1d..a6c6fd5 100644
--- a/GRRLIB/lib/png/Makefile
+++ b/GRRLIB/lib/png/Makefile
@@ -10,9 +10,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
 endif
 
-PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
-CC		:=	$(PREFIX)gcc
-AR		:=	$(PREFIX)ar
+include $(DEVKITPPC)/base_rules
 
 LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
 LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
@@ -37,6 +35,3 @@ install :
 	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
 	cp -f $(ARC) $(LIBOGC_LIB)/
 	cp -f $(HDR) $(LIBOGC_INC)/
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/pngu/Makefile b/GRRLIB/lib/pngu/Makefile
index 30a998b..2ef38f0 100644
--- a/GRRLIB/lib/pngu/Makefile
+++ b/GRRLIB/lib/pngu/Makefile
@@ -10,9 +10,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
 endif
 
-PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
-CC		:=	$(PREFIX)gcc
-AR		:=	$(PREFIX)ar
+include $(DEVKITPPC)/base_rules
 
 LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
 LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
@@ -37,6 +35,3 @@ install :
 	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
 	cp -f $(ARC) $(LIBOGC_LIB)/
 	cp -f $(HDR) $(LIBOGC_INC)/
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/GRRLIB/lib/zlib/Makefile b/GRRLIB/lib/zlib/Makefile
index 6bb3e13..a4b530d 100644
--- a/GRRLIB/lib/zlib/Makefile
+++ b/GRRLIB/lib/zlib/Makefile
@@ -10,9 +10,7 @@ ifeq ($(strip $(DEVKITPRO)),)
 $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro)
 endif
 
-PREFIX	:= $(DEVKITPPC)/bin/powerpc-eabi-
-CC		:=	$(PREFIX)gcc
-AR		:=	$(PREFIX)ar
+include $(DEVKITPPC)/base_rules
 
 LIBOGC_INC	:=	$(DEVKITPRO)/libogc/include
 LIBOGC_LIB	:=	$(DEVKITPRO)/libogc/lib/wii
@@ -37,6 +35,3 @@ install :
 	mkdir -p  $(LIBOGC_LIB)  $(LIBOGC_INC)
 	cp -f $(ARC) $(LIBOGC_LIB)/
 	cp -f $(HDR) $(LIBOGC_INC)/
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c $< -o $@