All pastes #1720282 Raw Edit

Something

public text v1 · immutable
#1720282 ·published 2009-12-19 10:52 UTC
rendered paste body
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 3a0e398..a6967b2 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -152,10 +152,12 @@ lib_LTLIBRARIES = \
 	libwebkit-1.0.la
 
 # Convenience libraries
-noinst_LTLIBRARIES = \
+lib_LTLIBRARIES += \
 	libJavaScriptCore.la \
 	libWebCore.la
 
+noinst_LTLIBRARIES = 
+
 # JavaScriptCore
 javascriptcore_cppflags += \
 	-I$(srcdir)/JavaScriptCore/ForwardingHeaders \
@@ -306,7 +308,7 @@ endif
 
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
-global_cflags += $(SYMBOL_VISIBILITY)
+#global_cflags += $(SYMBOL_VISIBILITY)
 
 else
 webcoregtk_cppflags += \
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index 97f3721..99291f6 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -3530,25 +3530,21 @@ IDL_BINDINGS_JS_PURE := \
 
 IDL_BINDINGS_JS := $(filter-out $(IDL_BINDINGS_JS_PURE),$(IDL_BINDINGS))
 
-webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.h,$(notdir $(IDL_BINDINGS)))
 
-webcore_built_nosources += $(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS)))
-
-libWebCoreJS_objects := $(patsubst %.idl,DerivedSources/JS%.lo,$(notdir $(IDL_BINDINGS_JS)))
-
-libWebCoreJS_depfiles := $(patsubst %.idl,DerivedSources/$(DEPDIR)/JS%.Plo,$(notdir $(IDL_BINDINGS_JS)))
-
-# Older automake versions (1.7) place Plo files in a different place:
-libWebCoreJS_depfiles += $(patsubst %.lo,$(DEPDIR)/%.Plo,$(libWebCoreJS_objects))
-
--include $(libWebCoreJS_depfiles)
-
-$(libWebCoreJS_objects): AM_CPPFLAGS+=$(libWebCore_la_CPPFLAGS)
-
-$(libWebCoreJS_objects): AM_CXXFLAGS+=$(libWebCore_la_CXXFLAGS)
-
-libWebCoreJS.la: $(libWebCoreJS_objects)
-	$(CXXLINK) $(libWebCoreJS_objects) $(LIBS)
+lib_LTLIBRARIES += libWebCoreJS.la
+libWebCoreJS_la_CPPFLAGS = $(libWebCore_la_CPPFLAGS)
+libWebCoreJS_la_CXXFLAGS = $(libWebCore_la_CXXFLAGS)
+libWebCoreJS_la_LIBADD = libWebCore.la
+BUILT_SOURCES += WebCore/GNUmakefile.WebCoreJS.am
+include WebCore/GNUmakefile.WebCoreJS.am
+GNUmakefile.in: $(WebCore)/GNUmakefile.WebCoreJS.am
+$(WebCore)/GNUmakefile.WebCoreJS.am: $(WebCore)/GNUmakefile.am
+	$(AM_V_GEN) \
+	echo "# Generated file, don't edit" >$@.tmp && \
+	echo "libWebCoreJS_la_SOURCES = " \
+		$(patsubst %.idl,DerivedSources/JS%.h,$(notdir $(IDL_BINDINGS))) \
+		$(patsubst %.idl,DerivedSources/JS%.cpp,$(notdir $(IDL_BINDINGS_JS))) >>$@.tmp && \
+	mv $@.tmp $@
 
 
 noinst_HEADERS += \