mirror of
https://github.com/yarrick/iodine.git
synced 2024-11-21 23:15:14 +00:00
Use -C in submake calls instead of cd
Reorder more common install/uninstall/clean before specialized targets.
This commit is contained in:
Erik Ekman
parent
95dedf51db
commit
ac931e65e7
122
Makefile
122
Makefile
@ -17,64 +17,7 @@ RM_FLAGS=-f
|
||||
TARGETOS = `uname`
|
||||
|
||||
all:
|
||||
@(cd src; $(MAKE) TARGETOS=$(TARGETOS) all)
|
||||
|
||||
#Helper target for windows/android zipfiles
|
||||
iodine-latest:
|
||||
@rm -rf iodine-latest*
|
||||
@mkdir -p iodine-latest
|
||||
@echo "Create date: " > iodine-latest/VERSION.txt
|
||||
@date >> iodine-latest/VERSION.txt
|
||||
@echo "Git version: " >> iodine-latest/VERSION.txt
|
||||
@git rev-parse HEAD >> iodine-latest/VERSION.txt
|
||||
@for i in README CHANGELOG TODO; do cp $$i iodine-latest/$$i.txt; done
|
||||
@unix2dos iodine-latest/*
|
||||
|
||||
cross-android:
|
||||
@(cd src; $(MAKE) base64u.c base64u.h)
|
||||
@(cd src; ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk)
|
||||
|
||||
iodine-latest-android.zip: iodine-latest
|
||||
@mv iodine-latest iodine-latest-android
|
||||
@mkdir -p iodine-latest-android/armeabi iodine-latest-android/x86
|
||||
@$(MAKE) cross-android TARGET_ARCH_ABI=armeabi
|
||||
@cp src/libs/armeabi/* iodine-latest-android/armeabi
|
||||
@$(MAKE) cross-android TARGET_ARCH_ABI=x86
|
||||
@cp src/libs/x86/* iodine-latest-android/x86
|
||||
@cp README-android.txt iodine-latest-android
|
||||
@zip -r iodine-latest-android.zip iodine-latest-android
|
||||
|
||||
cross-mingw32:
|
||||
@(cd src; $(MAKE) TARGETOS=windows32 CC=i686-w64-mingw32-gcc all)
|
||||
|
||||
cross-mingw64:
|
||||
@(cd src; $(MAKE) TARGETOS=windows32 CC=x86_64-w64-mingw32-gcc all)
|
||||
|
||||
iodine-latest-windows.zip: iodine-latest
|
||||
@mv iodine-latest iodine-latest-windows
|
||||
@mkdir -p iodine-latest-windows/64bit iodine-latest-windows/32bit
|
||||
@(cd src; $(MAKE) TARGETOS=windows32 CC=i686-w64-mingw32-gcc clean all)
|
||||
@i686-w64-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-windows/32bit/$$i.exe; done
|
||||
@cp /usr/i686-w64-mingw32/bin/zlib1.dll iodine-latest-windows/32bit
|
||||
@(cd src; $(MAKE) TARGETOS=windows32 CC=x86_64-w64-mingw32-gcc clean all)
|
||||
@x86_64-w64-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-windows/64bit/$$i.exe; done
|
||||
@cp /usr/x86_64-w64-mingw32/bin/zlib1.dll iodine-latest-windows/64bit
|
||||
@cp README-win32.txt iodine-latest-windows
|
||||
@zip -r iodine-latest-windows.zip iodine-latest-windows
|
||||
|
||||
cross-mingw:
|
||||
@(cd src; $(MAKE) TARGETOS=windows32 CC=i686-mingw32-gcc all)
|
||||
|
||||
iodine-latest-win32.zip: cross-mingw iodine-latest
|
||||
@mv iodine-latest iodine-latest-win32
|
||||
@mkdir -p iodine-latest-win32/bin
|
||||
@i686-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-win32/bin/$$i.exe; done
|
||||
@cp /usr/i686-mingw32/usr/bin/zlib1.dll iodine-latest-win32/bin
|
||||
@cp README-win32.txt iodine-latest-win32
|
||||
@zip -r iodine-latest-win32.zip iodine-latest-win32
|
||||
@$(MAKE) -C src/ TARGETOS=$(TARGETOS) all
|
||||
|
||||
install: all
|
||||
$(MKDIR) $(MKDIR_FLAGS) $(DESTDIR)$(sbindir)
|
||||
@ -94,11 +37,68 @@ uninstall:
|
||||
test: all
|
||||
@echo "!! The check library is required for compiling and running the tests"
|
||||
@echo "!! Get it at http://check.sf.net"
|
||||
@(cd tests; $(MAKE) TARGETOS=$(TARGETOS) all)
|
||||
@$(MAKE) -C tests/ TARGETOS=$(TARGETOS) all
|
||||
|
||||
clean:
|
||||
@echo "Cleaning..."
|
||||
@(cd src; $(MAKE) clean)
|
||||
@(cd tests; $(MAKE) clean)
|
||||
@$(MAKE) -C src/ clean
|
||||
@$(MAKE) -C tests/ clean
|
||||
@rm -rf bin iodine-latest*
|
||||
|
||||
#Helper target for windows/android zipfiles
|
||||
iodine-latest:
|
||||
@rm -rf iodine-latest*
|
||||
@mkdir -p iodine-latest
|
||||
@echo "Create date: " > iodine-latest/VERSION.txt
|
||||
@date >> iodine-latest/VERSION.txt
|
||||
@echo "Git version: " >> iodine-latest/VERSION.txt
|
||||
@git rev-parse HEAD >> iodine-latest/VERSION.txt
|
||||
@for i in README CHANGELOG TODO; do cp $$i iodine-latest/$$i.txt; done
|
||||
@unix2dos iodine-latest/*
|
||||
|
||||
cross-android:
|
||||
@$(MAKE) -C src/ base64u.c base64u.h
|
||||
@ndk-build -C src/ NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk
|
||||
|
||||
iodine-latest-android.zip: iodine-latest
|
||||
@mv iodine-latest iodine-latest-android
|
||||
@mkdir -p iodine-latest-android/armeabi iodine-latest-android/x86
|
||||
@$(MAKE) cross-android TARGET_ARCH_ABI=armeabi
|
||||
@cp src/libs/armeabi/* iodine-latest-android/armeabi
|
||||
@$(MAKE) cross-android TARGET_ARCH_ABI=x86
|
||||
@cp src/libs/x86/* iodine-latest-android/x86
|
||||
@cp README-android.txt iodine-latest-android
|
||||
@zip -r iodine-latest-android.zip iodine-latest-android
|
||||
|
||||
cross-mingw32:
|
||||
@$(MAKE) -C src/ TARGETOS=windows32 CC=i686-w64-mingw32-gcc all
|
||||
|
||||
cross-mingw64:
|
||||
@$(MAKE) -C src/ TARGETOS=windows32 CC=x86_64-w64-mingw32-gcc all
|
||||
|
||||
iodine-latest-windows.zip: iodine-latest
|
||||
@mv iodine-latest iodine-latest-windows
|
||||
@mkdir -p iodine-latest-windows/64bit iodine-latest-windows/32bit
|
||||
@$(MAKE) -C src/ TARGETOS=windows32 CC=i686-w64-mingw32-gcc clean all
|
||||
@i686-w64-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-windows/32bit/$$i.exe; done
|
||||
@cp /usr/i686-w64-mingw32/bin/zlib1.dll iodine-latest-windows/32bit
|
||||
@$(MAKE) -C src/ TARGETOS=windows32 CC=x86_64-w64-mingw32-gcc clean all
|
||||
@x86_64-w64-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-windows/64bit/$$i.exe; done
|
||||
@cp /usr/x86_64-w64-mingw32/bin/zlib1.dll iodine-latest-windows/64bit
|
||||
@cp README-win32.txt iodine-latest-windows
|
||||
@zip -r iodine-latest-windows.zip iodine-latest-windows
|
||||
|
||||
cross-mingw:
|
||||
@$(MAKE) -C src/ TARGETOS=windows32 CC=i686-mingw32-gcc all
|
||||
|
||||
iodine-latest-win32.zip: cross-mingw iodine-latest
|
||||
@mv iodine-latest iodine-latest-win32
|
||||
@mkdir -p iodine-latest-win32/bin
|
||||
@i686-mingw32-strip bin/iodine*
|
||||
@for i in `ls bin`; do cp bin/$$i iodine-latest-win32/bin/$$i.exe; done
|
||||
@cp /usr/i686-mingw32/usr/bin/zlib1.dll iodine-latest-win32/bin
|
||||
@cp README-win32.txt iodine-latest-win32
|
||||
@zip -r iodine-latest-win32.zip iodine-latest-win32
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user