Guest User

Untitled

a guest
Jun 19th, 2018
87
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.89 KB | None | 0 0
  1. diff --git a/class/System.Windows/Makefile.am b/class/System.Windows/Makefile.am
  2. index b07a92a..39ada2f 100644
  3. --- a/class/System.Windows/Makefile.am
  4. +++ b/class/System.Windows/Makefile.am
  5. @@ -50,6 +50,14 @@ RUNTIMECONTROLS=$(srcdir)/../Microsoft.SilverlightControls/SDKControls
  6. MSTOOLKIT=$(srcdir)/../Microsoft.Windows.Controls/Source
  7. WPFTOOLKIT=$(srcdir)/../WPF.Toolkit
  8.  
  9. +system_windows_generated_sources = \
  10. + $(srcdir)/Mono/GeneratedPInvokes.cs \
  11. + $(srcdir)/Mono/Kind.cs \
  12. + $(srcdir)/Mono/Types.g.cs \
  13. + $(srcdir)/System.Windows/DependencyObject.g.cs \
  14. + $(srcdir)/System.Windows/DependencyProperty.g.cs \
  15. + $(srcdir)/System.Windows/Events.g.cs
  16. +
  17. system_windows_sources = \
  18. $(srcdir)/MS.Internal.ComAutomation/ComAutomationParam.cs \
  19. $(srcdir)/Assembly/AssemblyInfo.cs \
  20. @@ -64,7 +72,6 @@ system_windows_sources = \
  21. $(srcdir)/Mono/EasingFunctionWrapper.cs \
  22. $(srcdir)/Mono/EventHandlerList.cs \
  23. $(srcdir)/Mono/Events.cs \
  24. - $(srcdir)/Mono/GeneratedPInvokes.cs \
  25. $(srcdir)/Mono/HeapUtil.cs \
  26. $(srcdir)/Mono/Helper.cs \
  27. $(srcdir)/Mono/Helper.PublicKey.cs \
  28. @@ -74,7 +81,6 @@ system_windows_sources = \
  29. $(srcdir)/Mono/INativeEventObjectWrapper.cs \
  30. $(srcdir)/Mono/IRefContainer.cs \
  31. $(srcdir)/Mono/IWeakListener.cs \
  32. - $(srcdir)/Mono/Kind.cs \
  33. $(srcdir)/Mono/ManagedType.cs \
  34. $(srcdir)/Mono/MoonError.cs \
  35. $(srcdir)/Mono/MoonException.cs \
  36. @@ -92,7 +98,6 @@ system_windows_sources = \
  37. $(srcdir)/Mono/Surface.cs \
  38. $(srcdir)/Mono/ToggleRef.cs \
  39. $(srcdir)/Mono/Types.cs \
  40. - $(srcdir)/Mono/Types.g.cs \
  41. $(srcdir)/Mono/UriHelper.cs \
  42. $(srcdir)/Mono/Value.cs \
  43. $(srcdir)/Mono/WeakCollectionChangedListener.cs \
  44. @@ -756,9 +761,6 @@ system_windows_sources = \
  45. $(srcdir)/System.Windows.Printing/PrintDocument.cs \
  46. $(srcdir)/System.Windows.Printing/PrintPageEventArgs.cs \
  47. $(srcdir)/System.Windows.Printing/BeginPrintEventArgs.cs \
  48. - $(srcdir)/System.Windows/DependencyObject.g.cs \
  49. - $(srcdir)/System.Windows/DependencyProperty.g.cs \
  50. - $(srcdir)/System.Windows/Events.g.cs \
  51. \
  52. $(WPFTOOLKIT)/VSM/System/Windows/TemplateVisualStateAttribute.cs \
  53. $(WPFTOOLKIT)/VSM/System/Windows/VisualStateGroup.cs \
  54. @@ -840,8 +842,8 @@ LINKER_FLAGS = \
  55. -b true \
  56. -m secattrs ../tuning/SecurityAttributes
  57.  
  58.  
  59. -$(assemblysl_raw): $(system_windows_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  60. - $(SMCS) $(NET_2_1_ASSEMBLY_DEPS) $(NONBOOTSTRAP_FLAGS_2_1) -target:library -out:$@ $(system_windows_sources) -d:NET_2_1 \
  61. +$(assemblysl_raw): $(system_windows_sources) $(system_windows_generated_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  62. + $(SMCS) $(NET_2_1_ASSEMBLY_DEPS) $(NONBOOTSTRAP_FLAGS_2_1) -target:library -out:$@ $(system_windows_sources) $(system_windows_generated_sources) -d:NET_2_1 \
  63. -keyfile:$(srcdir)/../silverlight.pub -delaysign+ \
  64. -resource:$(MSCONTROLS)/Resource.resources,System.Windows.Controls.Resource.resources -resource:$(assembly).g.resources
  65. sn -q -R $@ $(srcdir)/../mono.snk
  66. @@ -850,8 +852,8 @@ $(assemblysl): $(assemblysl_raw) $(sl_secattr)
  67. MONO_PATH="../lib/tuner:$$MONO_PATH" mono --debug $(LINKER) -o ../lib/2.1/ -d ../lib/2.1/ -a $(assemblysl_raw) $(LINKER_FLAGS) $(LINKER_STEPS)
  68. sn -q -R $@ $(srcdir)/../mono.snk
  69.  
  70. -$(assemblydesktop): $(system_windows_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  71. - $(GMCS) $(NET_3_0_ASSEMBLY_DEPS) $(NONBOOTSTRAP_FLAGS_DESKTOP) -target:library -out:$@ $(system_windows_sources) \
  72. +$(assemblydesktop): $(system_windows_sources) $(system_windows_generated_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  73. + $(GMCS) $(NET_3_0_ASSEMBLY_DEPS) $(NONBOOTSTRAP_FLAGS_DESKTOP) -target:library -out:$@ $(system_windows_sources) $(system_windows_generated_sources) \
  74. -resource:$(MSCONTROLS)/Resource.resources,System.Windows.Controls.Resource.resources -resource:$(assembly).g.resources \
  75. -keyfile:$(srcdir)/../mono.snk
  76.  
  77. @@ -860,8 +862,8 @@ $(assemblydesktop).config: Makefile $(assembly).dll.config
  78.  
  79. bootstrap: $(bootstrap_assemblysl) $(bootstrap_assemblydesktop)
  80.  
  81. -$(bootstrap_assemblysl_raw): $(system_windows_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  82. - $(SMCS) -d:BOOTSTRAP $(NET_2_1_ASSEMBLY_DEPS) -target:library -out:$@ $(system_windows_sources) -d:NET_2_1 -keyfile:$(srcdir)/../silverlight.pub \
  83. +$(bootstrap_assemblysl_raw): $(system_windows_sources) $(system_windows_generated_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  84. + $(SMCS) -d:BOOTSTRAP $(NET_2_1_ASSEMBLY_DEPS) -target:library -out:$@ $(system_windows_sources) $(system_windows_generated_sources) -d:NET_2_1 -keyfile:$(srcdir)/../silverlight.pub \
  85. -delaysign+ -resource:$(MSCONTROLS)/Resource.resources,System.Windows.Controls.Resource.resources -resource:$(assembly).g.resources
  86. sn -q -R $@ $(srcdir)/../mono.snk
  87.  
  88. @@ -870,8 +872,8 @@ $(bootstrap_assemblysl): $(bootstrap_assemblysl_raw) $(sl_secattr)
  89. -a $(bootstrap_assemblysl_raw) $(LINKER_FLAGS) $(LINKER_STEPS)
  90. sn -q -R $@ $(srcdir)/../mono.snk
  91.  
  92. -$(bootstrap_assemblydesktop): $(system_windows_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  93. - $(GMCS) -d:BOOTSTRAP $(NET_3_0_ASSEMBLY_DEPS) -target:library -out:$@ $(system_windows_sources) \
  94. +$(bootstrap_assemblydesktop): $(system_windows_sources) $(system_windows_generated_sources) Makefile $(MSCONTROLS)/Resource.resources $(assembly).g.resources
  95. + $(GMCS) -d:BOOTSTRAP $(NET_3_0_ASSEMBLY_DEPS) -target:library -out:$@ $(system_windows_sources) $(system_windows_generated_sources) \
  96. -resource:$(MSCONTROLS)/Resource.resources,System.Windows.Controls.Resource.resources -resource:$(assembly).g.resources \
  97. -keyfile:$(srcdir)/../mono.snk
  98.  
  99.  
  100. diff --git a/plugin/Makefile.am b/plugin/Makefile.am
  101. index 836331a..df45c48 100644
  102. --- a/plugin/Makefile.am
  103. +++ b/plugin/Makefile.am
  104. @@ -41,9 +41,13 @@ libmoonplugin_la_LDFLAGS = \
  105.  
  106. libmoonplugin_la_LIBADD = $(top_builddir)/src/libmoon-static.la $(PLUGIN_LIBS)
  107.  
  108. +nodist_libmoonplugin_la_SOURCES = \
  109. + cbinding.h \
  110. + cbinding.cpp \
  111. + plugin-class.g.cpp \
  112. + plugin-class.h
  113. +
  114. libmoonplugin_la_SOURCES = \
  115. - cbinding.h \
  116. - cbinding.cpp \
  117. browser-bridge.h \
  118. moonlight.h \
  119. npstream-request.cpp \
  120. @@ -59,8 +63,6 @@ libmoonplugin_la_SOURCES = \
  121. plugin-entry.cpp \
  122. plugin-glue.cpp \
  123. plugin-class.cpp \
  124. - plugin-class.g.cpp \
  125. - plugin-class.h \
  126. plugin-utils.cpp \
  127. ../src/pal/gtk/windowless-gtk.cpp \
  128. ../src/pal/gtk/windowless-gtk.h
  129. @@ -99,8 +101,7 @@ EXTRA_DIST = \
  130. moon.config \
  131. silverlight-versions.h.in \
  132. plugin-class.h.in \
  133. - plugin-class.g.cpp.in \
  134. - plugin-spinner.h
  135. + plugin-class.g.cpp.in
  136.  
  137. DISTCLEANFILES= silverlight-version.h
  138.  
  139.  
  140. diff --git a/src/Makefile.am b/src/Makefile.am
  141. index a7dee3c..cd4c418 100644
  142. --- a/src/Makefile.am
  143. +++ b/src/Makefile.am
  144. @@ -20,7 +20,6 @@ libmoon_include_headers = \
  145. brush.h \
  146. canvas.h \
  147. capture.h \
  148. - cbinding.h \
  149. clock.h \
  150. codec-url.h \
  151. collection.h \
  152. @@ -135,13 +134,11 @@ libmoon_include_headers = \
  153. timesource.h \
  154. transform.h \
  155. trigger.h \
  156. - type.h \
  157. uielement.h \
  158. uri.h \
  159. usercontrol.h \
  160. utils.h \
  161. validators.h \
  162. - value.h \
  163. weakrefmanager.h \
  164. webbrowser.h \
  165. writeablebitmap.h \
  166. @@ -149,6 +146,11 @@ libmoon_include_headers = \
  167. xap.h \
  168. yuv-converter.h
  169.  
  170. +nodist_libmoon_la_SOURCES = \
  171. + cbinding.cpp \
  172. + dependencyproperty.g.cpp\
  173. + type-generated.cpp
  174. +
  175. libmoon_la_SOURCES = \
  176. animation.cpp \
  177. application.cpp \
  178. @@ -162,7 +164,6 @@ libmoon_la_SOURCES = \
  179. brush.cpp \
  180. canvas.cpp \
  181. capture.cpp \
  182. - cbinding.cpp \
  183. clock.cpp \
  184. collection.cpp \
  185. color.cpp \
  186. @@ -176,7 +177,6 @@ libmoon_la_SOURCES = \
  187. deepzoomimagetilesource.cpp \
  188. dependencyobject.cpp \
  189. dependencyproperty.cpp \
  190. - dependencyproperty.g.cpp\
  191. deployment.cpp \
  192. dirty.cpp \
  193. dirty.h \
  194. @@ -265,7 +265,6 @@ libmoon_la_SOURCES = \
  195. transform.cpp \
  196. trigger.cpp \
  197. type.cpp \
  198. - type-generated.cpp \
  199. uielement.cpp \
  200. uri.cpp \
  201. usercontrol.cpp \
Add Comment
Please, Sign In to add comment