[patch] makefile patch for latest ebuilds

HTCFlasher_Makefiles.diff (text/plain), 7.66 KB, created by Lucian Muresan on 2008-09-02 00:00:12 UTC

diff -Naur HTCFlasher-20080806_orig/gui/Makefile HTCFlasher-20080806/gui/Makefile
--- HTCFlasher-20080806_orig/gui/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ HTCFlasher-20080806/gui/Makefile	2008-09-02 01:48:35.000000000 +0200
@@ -0,0 +1,23 @@
+-include ../Makefile.conf
+
+all:
+	echo "Nothing to build for 'gui'"
+
+install:
+	cp HTCFlasherGUI $(BINDIR)/
+	cp yangGUI $(BINDIR)/
+	cp htcflasher.png $(SHAREDIR)/icons/
+	cp yang.png $(SHAREDIR)/icons/
+	cp htcflasher.desktop $(SHAREDIR)/applications/
+	cp yang.desktop $(SHAREDIR)/applications/
+
+remove:
+	rm -f $(BINDIR)/HTCFlasherGUI
+	rm -f $(BINDIR)/yangGUI
+	rm -f $(SHAREDIR)/applications/htcflasher.desktop
+	rm -f $(SHAREDIR)/applications/yang.desktop
+	rm -f $(SHAREDIR)/icons/htcflasher.png
+	rm -f $(SHAREDIR)/icons/yang.png
+
+clean:
+	echo "Nothing to clean for 'gui'"
diff -Naur HTCFlasher-20080806_orig/Makefile HTCFlasher-20080806/Makefile
--- HTCFlasher-20080806_orig/Makefile	2008-08-06 04:02:34.000000000 +0200
+++ HTCFlasher-20080806/Makefile	2008-09-02 01:48:35.000000000 +0200
@@ -1,32 +1,59 @@
-all:
-	cd src && ${MAKE} all
+#
+# global Makefile for HTCFlasher, yang and lkr tools
+#
 
-install:
-	cp src/HTCFlasher /usr/bin/
-	cp src/yang /usr/bin/
-	cp gui/HTCFlasherGUI /usr/bin/
-	cp gui/yangGUI /usr/bin/
-	cp gui/htcflasher.png /usr/share/icons/
-	cp gui/yang.png /usr/share/icons/
-	cp gui/htcflasher.desktop /usr/share/applications/
-	cp gui/yang.desktop /usr/share/applications/
-	cd man && ${MAKE} install
-
-clean:
-	cd src && ${MAKE} clean
-
-remove:
-	rm /usr/bin/HTCFlasher
-	rm /usr/bin/HTCFlasherGUI
-	rm /usr/bin/yang
-	rm /usr/bin/yangGUI
-	rm /usr/share/applications/htcflasher.desktop
-	rm /usr/share/applications/yang.desktop
-	rm /usr/share/icons/htcflasher.png
-	rm /usr/share/icons/yang.png
-	rm /usr/share/man/man1/HTCFlasher.1
-	rm /usr/share/man/man1/HTCFlasherGUI.1
-	rm /usr/share/man/man1/yang.1
+PROJECT = HTCFlasher
+VERSION = 20080806
+ARCHIVE = $(PROJECT)-$(VERSION)
+PACKAGE = $(ARCHIVE)
+TMPDIR = /tmp
+
+
+### Targets:
+
+all: basetools kitchen
+
+install: install-basetools install-kitchen
+
+remove: remove-basetools remove-kitchen
+
+clean: clean-basetools clean-kitchen
+	@-rm -f ../$(PACKAGE).tar.gz
+
+basetools:
+	@$(MAKE) -C src all
+	@$(MAKE) -C man all
+
+install-basetools:
+	@$(MAKE) -C src install
+	@$(MAKE) -C man install
+	@$(MAKE) -C gui install
+
+remove-basetools:
+	@$(MAKE) -C src remove
+	@$(MAKE) -C man remove
+	@$(MAKE) -C gui remove
+
+clean-basetools:
+	@$(MAKE) -C src clean
+	@$(MAKE) -C man clean
 
 kitchen:
-	cd RomKitchen && ${MAKE} all && ${MAKE} install
+	@$(MAKE) -C RomKitchen all
+
+install-kitchen:
+	@$(MAKE) -C RomKitchen install
+
+remove-kitchen:
+	@$(MAKE) -C RomKitchen remove
+
+clean-kitchen:
+	@$(MAKE) -C RomKitchen clean
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf ../$(PACKAGE).tar.gz --exclude .svn --exclude *.cbp --exclude *.layout -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as ../$(PACKAGE).tar.gz
diff -Naur HTCFlasher-20080806_orig/Makefile.conf HTCFlasher-20080806/Makefile.conf
--- HTCFlasher-20080806_orig/Makefile.conf	1970-01-01 01:00:00.000000000 +0100
+++ HTCFlasher-20080806/Makefile.conf	2008-09-02 01:48:35.000000000 +0200
@@ -0,0 +1,29 @@
+#
+# User defined Makefile options for HTCFlasher, yang and lkr tools
+
+### The C compiler and options:
+
+CC       = gcc
+CFLAGS   = -Wall -m32
+#CXX      = g++
+#CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+LDFLAGS  = -m32
+LDCONFIG = ldconfig
+
+### The directory environment:
+
+ifndef $(DESTDIR)
+DESTDIR = /usr
+endif
+
+BINDIR = $(DESTDIR)/bin
+LIBDIR = $(DESTDIR)/lib
+INCDIR = $(DESTDIR)/include
+SHAREDIR = $(DESTDIR)/share
+MANDIR = $(SHAREDIR)/man
+
+
+### Includes and defines
+
+#INCLUDES += -I
+DEFINES += -D_GNU_SOURCE
diff -Naur HTCFlasher-20080806_orig/man/Makefile HTCFlasher-20080806/man/Makefile
--- HTCFlasher-20080806_orig/man/Makefile	2008-08-06 04:02:33.000000000 +0200
+++ HTCFlasher-20080806/man/Makefile	2008-09-02 01:49:58.000000000 +0200
@@ -1,9 +1,21 @@
+-include ../Makefile.conf
+
 all:
 	pod2man -c "User commands" -n yang yang.pod |sed -e 's/"perl.*/"yang v1.1" "User commands"/g' > yang.1
 	pod2man -c "User commands" -n HTCFlasher HTCFlasher.pod |sed -e 's/"perl.*/"HTCFlasher v3.1" "User commands"/g' > HTCFlasher.1
 	pod2man -c "User commands" -n HTCFlasherGUI HTCFlasherGUI.pod |sed -e 's/"perl.*/"HTCFlasherGUI v3.1" "User commands"/g' > HTCFlasherGUI.1
 
 install:
-	install -m 444 HTCFlasher.1 /usr/share/man/man1/
-	install -m 444 HTCFlasherGUI.1 /usr/share/man/man1/
-	install -m 444 yang.1 /usr/share/man/man1/
+	install -m 444 HTCFlasher.1 $(MANDIR)/man1/
+	install -m 444 HTCFlasherGUI.1 $(MANDIR)/man1/
+	install -m 444 yang.1 $(MANDIR)/man1/
+
+remove:
+	rm -f $(MANDIR)/man1/HTCFlasher.1
+	rm -f $(MANDIR)/man1/HTCFlasherGUI.1
+	rm -f $(MANDIR)/man1/yang.1
+
+clean:
+	rm -f HTCFlasher.1
+	rm -f HTCFlasherGUI.1
+	rm -f yang.1
diff -Naur HTCFlasher-20080806_orig/RomKitchen/Makefile HTCFlasher-20080806/RomKitchen/Makefile
--- HTCFlasher-20080806_orig/RomKitchen/Makefile	2008-08-06 04:02:31.000000000 +0200
+++ HTCFlasher-20080806/RomKitchen/Makefile	2008-09-02 01:48:35.000000000 +0200
@@ -1,5 +1,4 @@
-CC?=gcc
-CFLAGS=-m32 -Wall
+-include ../Makefile.conf
 
 all:
 	${CC} dsmbuild.c -o dsmbuild ${CFLAGS}
@@ -10,33 +9,34 @@
 	${CC} ImgfsFromNb.c -o ImgfsFromNb ${CFLAGS}
 
 install:
-	cp dsmbuild /usr/bin/
-	cp sofbuild /usr/bin/
-	cp dsminfo /usr/bin/
-	cp nbimg /usr/bin/
-	cp nbsplit /usr/bin/
-	cp ImgfsFromNb /usr/bin/
-	cp lrk /usr/bin/
-	cp lrk-extract /usr/bin/
-	cp lrk-build /usr/bin/
-	mkdir -p /usr/share/LinuxRomKitchen/
-	cp lrk-packages /usr/share/LinuxRomKitchen/
-	cp lrk-scripts /usr/share/LinuxRomKitchen/
-	cp lrk-preload /usr/share/LinuxRomKitchen/
-	cp lrk.svg /usr/share/LinuxRomKitchen/
-	cp lrk.desktop /usr/share/applications/
-
-clean:
-	-rm -f dsmbuild dsminfo sofbuild nbimg nbsplit ImgfsFromNb
+	cp dsmbuild $(BINDIR)/
+	cp sofbuild $(BINDIR)/
+	cp dsminfo $(BINDIR)/
+	cp nbimg $(BINDIR)/
+	cp nbsplit $(BINDIR)/
+	cp ImgfsFromNb $(BINDIR)/
+	cp lrk $(BINDIR)/
+	cp lrk-extract $(BINDIR)/
+	cp lrk-build $(BINDIR)/
+	mkdir -p $(SHAREDIR)/LinuxRomKitchen/
+	cp lrk-packages $(SHAREDIR)/LinuxRomKitchen/
+	cp lrk-scripts $(SHAREDIR)/LinuxRomKitchen/
+	cp lrk-preload $(SHAREDIR)/LinuxRomKitchen/
+	cp lrk.svg $(SHAREDIR)/icons/
+	cp lrk.desktop $(SHAREDIR)/applications/
 
 remove:
-	rm /usr/bin/dsmbuild
-	rm /usr/bin/dsminfo
-	rm /usr/bin/sofbuild
-	rm /usr/bin/nbimg
-	rm /usr/bin/nbsplit
-	rm /usr/bin/ImgfsFromNb
-	rm /usr/bin/lrk
-	rm /usr/bin/lrk-extract
-	rm /usr/bin/lrk-build
-	rm -rf /usr/share/LinuxRomKitchen/
+	rm -f $(BINDIR)/dsmbuild
+	rm -f $(BINDIR)/dsminfo
+	rm -f $(BINDIR)/sofbuild
+	rm -f $(BINDIR)/nbimg
+	rm -f $(BINDIR)/nbsplit
+	rm -f $(BINDIR)/ImgfsFromNb
+	rm -f $(BINDIR)/lrk
+	rm -f $(BINDIR)/lrk-extract
+	rm -f $(BINDIR)/lrk-build
+	rm -f $(SHAREDIR)/icons/lrk.svg
+	rm -rf $(SHAREDIR)/LinuxRomKitchen/
+
+clean:
+	rm -f dsmbuild dsminfo sofbuild nbimg nbsplit ImgfsFromNb
diff -Naur HTCFlasher-20080806_orig/src/Makefile HTCFlasher-20080806/src/Makefile
--- HTCFlasher-20080806_orig/src/Makefile	2008-08-06 04:02:33.000000000 +0200
+++ HTCFlasher-20080806/src/Makefile	2008-09-02 01:48:35.000000000 +0200
@@ -1,12 +1,19 @@
-CC?=gcc
+-include ../Makefile.conf
+
 OBJ=nbhextract.o utils.o io.o crc32.o flasher.o info.o prompt.o nbh.o main.o
 BIN=HTCFlasher
-CFLAGS=-Wall -m32
-LDFLAGS=-m32
 
 all: ${OBJ}
 	${CC} $(CFLAGS) $(LDFLAGS) ${OBJ} -o ${BIN}
 	${CC} $(CFLAGS) $(LDFLAGS) nbhextract.o nbh.o yang.c -o yang
 
+install:
+	cp HTCFlasher $(BINDIR)/
+	cp yang $(BINDIR)/
+
+remove:
+	rm -f $(BINDIR)/HTCFlasher
+	rm -f $(BINDIR)/yang
+
 clean:
 	-rm -f ${OBJ} ${BIN} yang