summaryrefslogtreecommitdiff
blob: ce534002ae61f1c4125ef6a5437e75ed8981b937 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
--- kst/src/extensions/js/Makefile.am.orig	2009-02-22 02:33:24.000000000 +0100
+++ kst/src/extensions/js/Makefile.am	2009-02-22 02:35:31.000000000 +0100
@@ -1,14 +1,7 @@
-if include_kjse_internal
-KJSEMBED_SUBDIR=kjsembed
-endif
-
 SUBDIRS=$(KJSEMBED_SUBDIR) .
 
-if include_kjse_internal
-KJSEINCLUDES=-I$(srcdir)/kjsembed
-else
 JSEXTERN=js_extern.cpp
-endif
+
 INCLUDES=-I$(top_srcdir)/kst/src/libkstapp -I$(top_srcdir)/kst/src/libkst -I$(top_srcdir)/kst/src/libkstmath -I$(top_srcdir)/kst/src/extdate -I$(top_builddir)/kst/src/libkst -I$(top_builddir)/kst/src/libkstapp -I$(top_srcdir)/kst/src/widgets -I$(top_srcdir) -I$(top_srcdir)/kst/src/plugins/crossspectrum -I$(top_srcdir)/kst/src/plugins/binnedmap $(KMDI_INCLUDES) $(KJSEINCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES=kstextension_js.la
@@ -21,11 +14,9 @@
 endif
 
 kstextension_js_la_LDFLAGS=$(all_libraries) -module -avoid-version
-if include_kjse_internal
-kstextension_js_la_LIBADD=$(LIBREADLINE) ../../libkstapp/libkstapp.la kjsembed/libkjsembed.la
-else
+
 kstextension_js_la_LIBADD=$(LIBREADLINE) ../../libkstapp/libkstapp.la -lkjsembed
-endif
+
 kstextension_js_la_SOURCES= $(JSEXTERN) \
 			    js.cpp \
 			    jsiface.skel \