From 37f992909416defbb34454137ff89705fb4f40ac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Patrycjusz=20R=2E=20=C5=81ogiewa?= Date: Mon, 16 May 2016 22:14:05 +0200 Subject: [PATCH] adapted for zip/install targets --- libsrc/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libsrc/Makefile b/libsrc/Makefile index c4c1b78a7..54e0a7540 100644 --- a/libsrc/Makefile +++ b/libsrc/Makefile @@ -39,12 +39,13 @@ DRVTYPES = emd \ tgi OUTPUTDIRS := lib \ - target \ asminc \ cfg \ include \ samples \ - $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*))) + $(subst ../,,$(filter-out $(wildcard ../include/*.*),$(wildcard ../include/*)))\ + $(subst ../,,$(wildcard ../target/*/drv/*))\ + $(subst ../,,$(wildcard ../target/*/util))\ .PHONY: all mostlyclean clean install zip lib $(TARGETS) @@ -80,8 +81,8 @@ mostlyclean: # Transitional line active. Final line commented out below in order to # allow some time for transition between the directory structures clean: - $(call RMDIR,../libwrk ../lib ../targetutil ../target $(addprefix ../,$(DRVTYPES))) -# $(call RMDIR,../libwrk ../lib ../target) + $(call RMDIR,../libwrk ../lib ../targetutil ../$(TARGETDIR) $(addprefix ../,$(DRVTYPES))) +# $(call RMDIR,../libwrk ../lib ../$(TARGETDIR)) ifdef CMD_EXE @@ -95,13 +96,14 @@ define INSTALL_recipe $(if $(prefix),,$(error variable `prefix' must be set)) $(INSTALL) -d $(DESTDIR)$(datadir)/$(dir) -$(INSTALL) -m644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir) +$(INSTALL) -m0644 ../$(dir)/*.* $(DESTDIR)$(datadir)/$(dir) endef # INSTALL_recipe install: $(foreach dir,$(OUTPUTDIRS),$(INSTALL_recipe)) + endif # CMD_EXE define ZIP_recipe -- 2.39.5