From kde-commits Sat Jan 08 21:42:36 2005 From: Alexander Dymo Date: Sat, 08 Jan 2005 21:42:36 +0000 To: kde-commits Subject: kdevelop/languages/cpp/app_templates Message-Id: <20050108214236.04DDE1B8E9 () office ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=110522062603622 CVS commit by dymo: Use KDE_ICON=AUTO in makefiles for KDE template projects - this allows correct processing of kde_icon target in kdevelop and fixes icon installation. BUG: 96437 M +1 -1 kapp/src-Makefile.am 1.5 M +1 -1 kateplugin/src-Makefile.am 1.6 M +1 -1 kateplugin2/src-Makefile.am 1.6 M +1 -1 kbearplugin/src-Makefile.am 1.4 M +1 -1 khello2/src-Makefile.am 1.5 M +1 -1 kpartapp/src-Makefile.am 1.5 M +1 -1 kpartplugin/src-Makefile.am 1.5 M +1 -1 kxt/src-Makefile.am 1.6 --- kdevelop/languages/cpp/app_templates/kapp/src-Makefile.am #1.4:1.5 @@ -33,5 +33,5 @@ $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # this is where the kdelnk file will go --- kdevelop/languages/cpp/app_templates/kateplugin/src-Makefile.am #1.5:1.6 @@ -2,5 +2,5 @@ METASOURCES = AUTO -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # Install this plugin in the KDE modules directory --- kdevelop/languages/cpp/app_templates/kateplugin2/src-Makefile.am #1.5:1.6 @@ -2,5 +2,5 @@ METASOURCES = AUTO -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # Install this plugin in the KDE modules directory --- kdevelop/languages/cpp/app_templates/kbearplugin/src-Makefile.am #1.3:1.4 @@ -1,5 +1,5 @@ INCLUDES = $(all_includes) -KDE_ICON = kbear%{APPNAMELC} +KDE_ICON = AUTO kde_module_LTLIBRARIES = libkbear%{APPNAMELC}.la --- kdevelop/languages/cpp/app_templates/khello2/src-Makefile.am #1.4:1.5 @@ -12,5 +12,5 @@ $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO ######################################################################### --- kdevelop/languages/cpp/app_templates/kpartapp/src-Makefile.am #1.4:1.5 @@ -12,5 +12,5 @@ $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # this Makefile creates both a KPart application and a KPart --- kdevelop/languages/cpp/app_templates/kpartplugin/src-Makefile.am #1.4:1.5 @@ -2,5 +2,5 @@ METASOURCES = AUTO -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # Install this plugin in the KDE modules directory --- kdevelop/languages/cpp/app_templates/kxt/src-Makefile.am #1.5:1.6 @@ -31,5 +31,5 @@ $(XGETTEXT) *.cpp -o $(podir)/%{APPNAMELC}.pot -KDE_ICON = %{APPNAMELC} +KDE_ICON = AUTO # this is where the kdelnk file will go