Let make clean continue when a file can't be deleted.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@832 ea778897-0a13-0410-b9d1-a72fbfd435f5master
parent
8520ef16e2
commit
a5bf4b765d
|
@ -1,16 +1,19 @@
|
||||||
2006-09-22 Nick Treleaven <nick.treleaven@btinternet.com>
|
2006-09-22 Nick Treleaven <nick.treleaven@btinternet.com>
|
||||||
|
|
||||||
* src/main.c: Apply toolbar style on startup (Fixes #1563125).
|
* src/main.c: Apply toolbar style on startup (Fixes #1563125).
|
||||||
* src/build.c src/geany.h:
|
* src/build.c, src/geany.h:
|
||||||
Prevent a segfault if the Terminal tool is not set.
|
Prevent a segfault if the Terminal tool is not set.
|
||||||
Use cmd.exe as default Terminal tool on Windows.
|
Use cmd.exe as default Terminal tool on Windows.
|
||||||
|
* scintilla/makefile.win32, src/makefile.win32,
|
||||||
|
tagmanager/makefile.win32, makefile.win32:
|
||||||
|
Let make clean continue when a file can't be deleted.
|
||||||
|
|
||||||
|
|
||||||
2006-09-21 Nick Treleaven <nick.treleaven@btinternet.com>
|
2006-09-21 Nick Treleaven <nick.treleaven@btinternet.com>
|
||||||
|
|
||||||
* src/ui_utils.c:
|
* src/ui_utils.c:
|
||||||
Fix a bug when clicking on a recent file.
|
Fix a bug when clicking on a recent file.
|
||||||
* src/callbacks.c src/sciwrappers.c:
|
* src/callbacks.c, src/sciwrappers.c:
|
||||||
Prevent a partial selection on a line being deleted when using
|
Prevent a partial selection on a line being deleted when using
|
||||||
CTRL-I to indent; also improve CTRL-Shift-I unindenting. Closes
|
CTRL-I to indent; also improve CTRL-Shift-I unindenting. Closes
|
||||||
#1557963.
|
#1557963.
|
||||||
|
|
|
@ -35,13 +35,13 @@ config.h: win32-config.h
|
||||||
$(CP) $< $@
|
$(CP) $< $@
|
||||||
|
|
||||||
deps:
|
deps:
|
||||||
$(RM) tagmanager\deps.mak scintilla\deps.mak src\deps.mak
|
-$(RM) tagmanager\deps.mak scintilla\deps.mak src\deps.mak
|
||||||
|
|
||||||
# used by src/makefile.win32 to avoid del ../file which is an error
|
# used by src/makefile.win32 to avoid del ../file which is an error
|
||||||
clean-local:
|
clean-local:
|
||||||
$(RM) geany_private.res geany.exe
|
-$(RM) geany_private.res geany.exe
|
||||||
|
|
||||||
clean:
|
clean: deps
|
||||||
cd tagmanager && make -f makefile.win32 clean && cd ..
|
cd tagmanager && make -f makefile.win32 clean && cd ..
|
||||||
cd scintilla && make -f makefile.win32 clean && cd ..
|
cd scintilla && make -f makefile.win32 clean && cd ..
|
||||||
cd src && make -f makefile.win32 clean && cd ..
|
cd src && make -f makefile.win32 clean && cd ..
|
||||||
|
|
|
@ -67,7 +67,7 @@ LexPerl.o LexPython.o LexSQL.o LexCaml.o LexOMS.o LexTCL.o LexRuby.o LexFortran.
|
||||||
all: $(COMPLIB)
|
all: $(COMPLIB)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) deps.mak *.o $(COMPLIB)
|
-$(RM) deps.mak *.o $(COMPLIB)
|
||||||
|
|
||||||
$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
|
$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
|
||||||
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
|
ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatGTK.o \
|
||||||
|
|
|
@ -59,7 +59,7 @@ $(RES): ../geany_private.rc ../pixmaps/geany.ico
|
||||||
|
|
||||||
# this calls parent clean-local target because del ../file won't work
|
# this calls parent clean-local target because del ../file won't work
|
||||||
clean:
|
clean:
|
||||||
$(RM) deps.mak *.o
|
-$(RM) deps.mak *.o
|
||||||
cd .. && make -f makefile.win32 clean-local && cd src
|
cd .. && make -f makefile.win32 clean-local && cd src
|
||||||
|
|
||||||
exec:
|
exec:
|
||||||
|
|
|
@ -30,7 +30,7 @@ CCFLAGS=-g -Wall -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-
|
||||||
all: $(COMPLIB)
|
all: $(COMPLIB)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) deps.mak *.o $(COMPLIB)
|
-$(RM) deps.mak *.o $(COMPLIB)
|
||||||
|
|
||||||
$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o \
|
$(COMPLIB): args.o c.o fortran.o make.o conf.o pascal.o perl.o php.o \
|
||||||
python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \
|
python.o regex.o sh.o ctags.o entry.o get.o keyword.o options.o parse.o \
|
||||||
|
|
Loading…
Reference in New Issue