Signed-off-by: Mihai Moldovan <ionic@ionic.de> --- .gitignore | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..366a7d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# Typically generated by qmake from x2goclient.pro. +Makefile + +# Temporary object files/static libs. +*.[oa] + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app -- 1.7.9
Hi Mihai, On So 26 Feb 2012 12:04:47 CET Mihai Moldovan wrote:
Signed-off-by: Mihai Moldovan <ionic@ionic.de>
.gitignore | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..366a7d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,19 @@ +# Typically generated by qmake from x2goclient.pro. +Makefile + +# Temporary object files/static libs. +*.[oa] + +# Generated by qmake. +moc_*.cpp +ui_*.h +qrc_resources.cpp + +# VIM temporary files. +.*.sw* + +# Generated by lrelease. +x2goclient_*.qm + +# Generated by qmake when building on OS X. +x2goclient.app
1.7.9
the .gitignore file has been added with one modification: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=acc0632ba462e6e3... The main Makefile is from us. qmake does not build in the base directory of the x2goclient source tree. The main Makefile creates a build dir first and then runs qmake in that directory. So: not ignoring the main Makefile. Mike -- DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419 GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
Hey Mike,
- On 29.02.2012 04:37 PM, Mike Gabriel wrote:
The main Makefile is from us. qmake does not build in the base directory of the x2goclient source tree. The main Makefile creates a build dir first and then runs qmake in that directory. So: not ignoring the main Makefile. Oh, seems like I've been building x2go "wrongly" the whole time. Always ran qmake in the main directory which was overwriting the main Makefile (well... from what I can tell, it worked fine. :/)
If that's the case, maybe my latest patch is redundant, as the "general" makefile should already be building .qm files (although it used lrelease-qt4 which is not available on my system, seems to be some weird symlinking between Qt3 and Qt4 lrelease binaries -- I just have my normal Qt4 lrelease binary.)
Gotta take a look a look at this, thanks!
Best regards,
Mihai
Hi Mihai,
On Mi 29 Feb 2012 16:44:57 CET Mihai Moldovan wrote:
Hey Mike,
- On 29.02.2012 04:37 PM, Mike Gabriel wrote:
The main Makefile is from us. qmake does not build in the base directory of the x2goclient source tree. The main Makefile creates a build dir first and then runs qmake in that directory. So: not ignoring the main Makefile. Oh, seems like I've been building x2go "wrongly" the whole time. Always ran qmake in the main directory which was overwriting the main Makefile (well... from what I can tell, it worked fine. :/)
If that's the case, maybe my latest patch is redundant, as the "general" makefile should already be building .qm files (although it used lrelease-qt4 which is not available on my system, seems to be some weird
symlinking between Qt3 and Qt4 lrelease binaries -- I just have my normal Qt4 lrelease binary.)
I like implementing the translation process into the x2goclient.pro
file. Will investigate that later.
Greets, Mike
--
DAS-NETZWERKTEAM mike gabriel, dorfstr. 27, 24245 barmissen fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xf...
-
Mihai Moldovan -
Mike Gabriel