Merge pull request #853 from echampet/onclick

[mono.git] / data / Makefile.am

diff --git a/data/Makefile.am b/data/Makefile.am
index 30e26a9014b77605ffe2023106bd19483edbaa0b..2cfd5202b65cf01da419f10a70ccdeed2e40d0ed 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,10 +1,7 @@
-SUBDIRS = net_2_0
-
-if INSTALL_4_0
-SUBDIRS += net_4_0 net_4_5
-endif
+SUBDIRS = net_2_0 net_4_0 net_4_5
 
 monodir = $(sysconfdir)/mono
+monolldbdir = $(libdir)/mono/lldb
 
 EXTRA_DIST =   \
        config.in \
@@ -12,11 +9,12 @@ EXTRA_DIST =         \
        mono.pc.in mono-2.pc.in monosgen-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
        mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
        mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
-       dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
+       dtrace-prelink.sh system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
        reactive.pc.in xbuild12.pc \
        net_1_1/machine.config \
        gdb/mono-gdb.py \
-       gdb/gdb-python.diff
+       gdb/gdb-python.diff     \
+       lldb/mono.py
 
 pkgconfigdir = $(libdir)/pkgconfig
 
@@ -26,24 +24,16 @@ else
 SGENPCFILE=
 endif
 
-if JIT_SUPPORTED
-if INTERP_SUPPORTED
-pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
-               system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
-else
 pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
-               system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
-endif
-else
-pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
-endif
+               system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
 
 DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
-               system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
+               system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
 
 mono_DATA =  config \
             browscap.ini
 
+monolldb_DATA = lldb/mono.py
 gdbdir = $(bindir)
 
 mono-sgen-gdb.py: gdb/mono-gdb.py