diff options
author | Bryan Ischo <bji@lolita.(none)> | 2009-02-17 16:37:11 +1300 |
---|---|---|
committer | Bryan Ischo <bji@lolita.(none)> | 2009-02-17 16:37:11 +1300 |
commit | 8c25dda2ed127b3160b036e8eb54231c210cf080 (patch) | |
tree | d46abed9dca3e566f799b1094a44c16c0dc1df73 | |
parent | ac0613926b86544b62906c0e1a8c7767dfcef27e (diff) | |
download | ceph-libs3-8c25dda2ed127b3160b036e8eb54231c210cf080.tar.gz |
* Improved GNUmakefile.mingw
-rw-r--r-- | GNUmakefile.mingw | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/GNUmakefile.mingw b/GNUmakefile.mingw index 5e1d34e..cb9cf22 100644 --- a/GNUmakefile.mingw +++ b/GNUmakefile.mingw @@ -62,10 +62,10 @@ ifdef VERBOSE VERBOSE = true VERBOSE_ECHO = @ echo VERBOSE_SHOW = - QUIET_ECHO = @ echo > /dev/null + QUIET_ECHO = @ echo >nul else VERBOSE = false - VERBOSE_ECHO = @ echo > /dev/null + VERBOSE_ECHO = @ echo >nul VERBOSE_SHOW = @ QUIET_ECHO = @ echo endif @@ -154,23 +154,24 @@ exported: libs3 s3 headers .PHONY: install install: exported - $(QUIET_ECHO) $(DESTDIR)\bin\s3.exe: Installing executable - - @ mkdir $(DESTDIR)\bin - $(VERBOSE_SHOW) copy $(BUILD)\bin\s3.exe $(DESTDIR)\bin\s3.exe - $(QUIET_ECHO) $(DESTDIR)\bin\libs3.dll: Installing dynamic library - $(VERBOSE_SHOW) copy $(BUILD)\bin\libs3.dll $(DESTDIR)\bin\libs3.dll - $(QUIET_ECHO) $(DESTDIR)\lib\libs3.a: Installing static library - - @ mkdir $(DESTDIR)\lib - $(VERBOSE_SHOW) copy $(BUILD)\lib\libs3.a $(DESTDIR)\lib\libs3.a - $(QUIET_ECHO) $(DESTDIR)\lib\libs3.def: Installing def file - $(VERBOSE_SHOW) copy mswin\libs3.def $(DESTDIR)\lib\libs3.def - - @ mkdir $(DESTDIR)\include - $(QUIET_ECHO) $(DESTDIR)\include\libs3.h: Copying header - $(VERBOSE_SHOW) copy $(BUILD)\include\libs3.h $(DESTDIR)\include\libs3.h - $(QUIET_ECHO) $(DESTDIR)\LICENSE: Copying license - $(VERBOSE_SHOW) copy LICENSE $(DESTDIR)\LICENSE - $(QUIET_ECHO) $(DESTDIR)\COPYING: Copying license - $(VERBOSE_SHOW) copy COPYING $(DESTDIR)\COPYING + $(QUIET_ECHO) $(DESTDIR)/bin/s3.exe: Installing executable + - @ mkdir $(DESTDIR)\bin 2>&1 | echo >nul + $(VERBOSE_SHOW) copy $(BUILD)\bin\s3.exe $(DESTDIR)\bin\s3.exe >nul + $(QUIET_ECHO) $(DESTDIR)/bin/libs3/dll: Installing dynamic library + $(VERBOSE_SHOW) copy $(BUILD)\bin\libs3.dll $(DESTDIR)\bin\libs3.dll >nul + $(QUIET_ECHO) $(DESTDIR)/lib/libs3.a: Installing static library + - @ mkdir $(DESTDIR)\lib 2>&1 | echo >nul + $(VERBOSE_SHOW) copy $(BUILD)\lib\libs3.a $(DESTDIR)\lib\libs3.a >nul + $(QUIET_ECHO) $(DESTDIR)/lib/libs3.def: Installing def file + $(VERBOSE_SHOW) copy mswin\libs3.def $(DESTDIR)\lib\libs3.def >nul + - @ mkdir $(DESTDIR)\include 2>&1 | echo >nul + $(QUIET_ECHO) $(DESTDIR)/include/libs3.h: Copying header + $(VERBOSE_SHOW) copy $(BUILD)\include\libs3.h \ + $(DESTDIR)\include\libs3.h >nul + $(QUIET_ECHO) $(DESTDIR)/LICENSE: Copying license + $(VERBOSE_SHOW) copy LICENSE $(DESTDIR)\LICENSE >nul + $(QUIET_ECHO) $(DESTDIR)/COPYING: Copying license + $(VERBOSE_SHOW) copy COPYING $(DESTDIR)\COPYING >nul # -------------------------------------------------------------------------- @@ -194,10 +195,10 @@ uninstall: $(BUILD)/obj/%.o: src/%.c $(QUIET_ECHO) $@: Compiling object - - @ mkdir $(subst /,\,$(dir $(BUILD)/dep/$<)) + - @ mkdir $(subst /,\,$(dir $(BUILD)/dep/$<)) 2>&1 | echo >nul @ gcc $(CFLAGS) -M -MG -MQ $@ -DCOMPILINGDEPENDENCIES \ -o $(BUILD)/dep/$(<:%.c=%.d) -c $< - - @ mkdir $(subst /,\,$(dir $@)) + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) gcc $(CFLAGS) -o $@ -c $< @@ -217,12 +218,12 @@ LIBS3_SOURCES := src/acl.c src/bucket.c src/error_parser.c src/general.c \ $(LIBS3_SHARED): $(LIBS3_SOURCES:src/%.c=$(BUILD)/obj/%.o) $(QUIET_ECHO) $@: Building dynamic library - - @ mkdir $(subst /,\,$(dir $@)) + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) gcc -shared -o $@ $^ $(LDFLAGS) -lws2_32 $(LIBS3_STATIC): $(LIBS3_SHARED) $(QUIET_ECHO) $@: Building static library - - @ mkdir $(subst /,\,$(dir $@)) + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) dlltool --def mswin\libs3.def --dllname $(subst /,\,$<) \ --output-lib $(subst /,\,$@) @@ -236,7 +237,7 @@ s3: $(BUILD)/bin/s3.exe $(BUILD)/bin/s3.exe: $(BUILD)/obj/s3.o $(BUILD)/obj/mingw_s3_functions.o \ $(BUILD)/lib/libs3.a $(QUIET_ECHO) $@: Building executable - - @ mkdir $(subst /,\,$(dir $@)) + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) gcc -o $@ $^ $(LDFLAGS) -lws2_32 @@ -248,7 +249,7 @@ headers: $(BUILD)\include\libs3.h $(BUILD)\include\libs3.h: inc\libs3.h $(QUIET_ECHO) $@: Copying header - - @ mkdir $(subst /,\,$(dir $@)) + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) copy $< $@ @@ -260,8 +261,8 @@ test: $(BUILD)/bin/testsimplexml $(BUILD)/bin/testsimplexml: $(BUILD)/obj/testsimplexml.o \ $(BUILD)/obj/simplexml.o - $(QUIET_ECHO $@: Building executable - - @ mkdir $(subst /,\,$(dir $@)) + $(QUIET_ECHO) $@: Building executable + - @ mkdir $(subst /,\,$(dir $@)) 2>&1 | echo >nul $(VERBOSE_SHOW) gcc -o $@ $^ $(LIBXML2_LIBS) |