← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to kcontrol/konqhtml/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Ana Beatriz Guerrero Lopez
  • Date: 2009-04-05 05:22:13 UTC
  • mfrom: (0.4.2 experimental) (0.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 235.
  • Revision ID: james.westby@ubuntu.com-20090405052213-39thr4l6p2ss07uj
Tags: 4:4.2.2-1
http://bugs.debian.org/290285
http://bugs.debian.org/359680
http://bugs.debian.org/286342
http://bugs.debian.org/444800
* New upstream release:
  - khtml fixes. (Closes: #290285, #359680)
  - Default konsole sessions can be deleted. (Closes: #286342)
  - Tag widget uses standard application palette. (Closes: #444800)
  - ... and surely many more but we have lost track...

Show diffs side-by-side

added added

removed removed

Lines of Context:
kcontrol/konqhtml/Makefile.am
1
 
AM_CPPFLAGS  = -I$(top_srcdir)/libkonq -I$(top_srcdir)/kcontrol/input $(all_includes)
2
 
AM_LDFLAGS =  $(all_libraries)
3
 
 
4
 
METASOURCES = AUTO 
5
 
 
6
 
kde_module_LTLIBRARIES = kcm_konqhtml.la
7
 
 
8
 
kcm_konqhtml_la_SOURCES = advancedTabDialog.cpp htmlopts.cpp jsopts.cpp \
9
 
                             javaopts.cpp pluginopts.cpp appearance.cpp \
10
 
                             khttpoptdlg.cpp policydlg.cpp main.cpp \
11
 
                             jspolicies.cpp nsconfigwidget.ui policies.cpp \
12
 
                             domainlistview.cpp advancedTabOptions.ui \
13
 
                             filteropts.cpp
14
 
 
15
 
kcm_konqhtml_la_LDFLAGS  = $(all_libraries) -module -avoid-version -no-undefined
16
 
kcm_konqhtml_la_LIBADD = -lkhtml -lkdeui
17
 
 
18
 
xdg_apps_DATA = khtml_behavior.desktop khtml_java_js.desktop khtml_fonts.desktop khtml_filter.desktop
19
 
 
20
 
messages: rc.cpp
21
 
        $(XGETTEXT) *.cpp -o $(podir)/kcmkonqhtml.pot
22
 
 
23
 
install-data-local: uninstall.desktop
24
 
        $(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing
25
 
        $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/nsplugin.desktop
26
 
        $(INSTALL_DATA) $(srcdir)/uninstall.desktop $(DESTDIR)$(kde_appsdir)/Settings/WebBrowsing/khtml_appearance.desktop