diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-04 06:21:59 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-01-04 06:21:59 +0000 |
| commit | c01c2e1f191c04841f480a1bd768277e7ef4726c (patch) | |
| tree | c5830d6a065b394969ab6278f0fdb49c69af88ee | |
| parent | 65cf1e63bbfb4fe8bede01b16201b624ce78aa88 (diff) | |
| download | tdebase-c01c2e1f191c04841f480a1bd768277e7ef4726c.tar.gz tdebase-c01c2e1f191c04841f480a1bd768277e7ef4726c.zip | |
Repair gcc 4.4 compilation errors
gcc 4.x tries to compile ANY .cpp file, including tips.cpp, so we now generate a tips.txt file instead and use that to generate the .po files
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1069698 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | kate/Makefile.am | 8 | ||||
| -rw-r--r-- | ktip/Makefile.am | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kate/Makefile.am b/kate/Makefile.am index 9726ea167..4a8b97f91 100644 --- a/kate/Makefile.am +++ b/kate/Makefile.am @@ -2,11 +2,11 @@ SUBDIRS = utils interfaces app data pics EXTRA_DIST = AUTHORS COPYING.LIB ChangeLog DESIGN NEWS README TODO messages: - rm -f tips.cpp - (cd data && $(PREPARETIPS) > ../tips.cpp) + rm -f tips.txt + (cd data && $(PREPARETIPS) > ../tips.txt) $(EXTRACTRC) ./*/*.rc >> ./rc.cpp - $(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/kate.pot - rm -f tips.cpp + $(XGETTEXT) `find . -name "*.cpp" -o -name "*.txt"` -o $(podir)/kate.pot + rm -f tips.txt include ../admin/Doxyfile.am diff --git a/ktip/Makefile.am b/ktip/Makefile.am index cae9bae63..4ce2dd31a 100644 --- a/ktip/Makefile.am +++ b/ktip/Makefile.am @@ -20,9 +20,9 @@ install-data-local: uninstall.desktop $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Toys/ktip.desktop messages: - $(PREPARETIPS) > tips.cpp - $(XGETTEXT) *.cpp -o $(podir)/ktip.pot - rm -f tips.cpp + $(PREPARETIPS) > tips.txt + $(XGETTEXT) *.txt *.cpp -o $(podir)/ktip.pot + rm -f tips.txt appdata_DATA = tips appdatadir=$(kde_datadir)/kdewizard |