From 636f509299122d02087c6fd62e1e4a46dbd22026 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Wed, 8 Jan 2014 20:06:00 +0100 Subject: Rename many classes to avoid conflicts with KDE --- xparts/mozilla/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xparts/mozilla') diff --git a/xparts/mozilla/Makefile.am b/xparts/mozilla/Makefile.am index 743ce97e..58e8746f 100644 --- a/xparts/mozilla/Makefile.am +++ b/xparts/mozilla/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(srcdir)/../src/kde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes) +INCLUDES = -I$(srcdir)/../src/tde -I$(srcdir)/../src/interfaces -I$(srcdir)/../src/gtk -I$(prefix)/include -I$(top_srcdir) $(MOZILLA_INCLUDES) $(all_includes) AM_CFLAGS = $(GTK2_CFLAGS) $(GLIB2_CFLAGS) @@ -6,7 +6,7 @@ lib_LTLIBRARIES = libkmozillapart.la libkmozillapart_la_SOURCES = kmozillapart.cpp libkmozillapart_la_LDFLAGS = -module $(all_libraries) -libkmozillapart_la_LIBADD = ../src/kde/libkdexparts.la +libkmozillapart_la_LIBADD = ../src/tde/libtdexparts.la servicedir = $(kde_servicesdir) service_DATA = kmozilla.desktop @@ -18,7 +18,7 @@ kmozilla_LDADD = ../src/gtk/libgtkxparts.la $(GTK2_LIBS) $(GLIB2_LIBS) kmozilla_LDFLAGS = $(MOZILLA_LDFLAGS) $(GLIB2_LDFLAGS) $(GTK2_LIBS) -L/usr/lib/mozilla -Wl,--rpath=/usr/lib/mozilla -lxul -lxpcom -lmozjs $(all_libraries) #kshell_SOURCES = kshell.cpp -#kshell_LDADD = $(top_builddir)/xtdeparts/kde/libkdexparts.la +#kshell_LDADD = $(top_builddir)/xtdeparts/tde/libtdexparts.la #kshell_LDFLAGS = $(all_libraries) METASOURCES = AUTO -- cgit v1.2.1