diff options
Diffstat (limited to 'JavaScriptCore/GNUmakefile.am')
| -rw-r--r-- | JavaScriptCore/GNUmakefile.am | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/JavaScriptCore/GNUmakefile.am b/JavaScriptCore/GNUmakefile.am index dd2ba21..88d1761 100644 --- a/JavaScriptCore/GNUmakefile.am +++ b/JavaScriptCore/GNUmakefile.am @@ -546,7 +546,6 @@ javascriptcore_sources += \ if TARGET_WIN32 javascriptcore_sources += \ - JavaScriptCore/wtf/ThreadSpecificWin.cpp \ JavaScriptCore/runtime/MarkStackWin.cpp else javascriptcore_sources += \ @@ -568,9 +567,9 @@ endif # USE_ICU_UNICODE # ---- if USE_GLIB_UNICODE javascriptcore_sources += \ + JavaScriptCore/wtf/unicode/UnicodeMacrosFromICU.h \ JavaScriptCore/wtf/unicode/glib/UnicodeGLib.h \ - JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp \ - JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h + JavaScriptCore/wtf/unicode/glib/UnicodeGLib.cpp endif JavaScriptCore/Lexer.lut.h: $(srcdir)/JavaScriptCore/create_hash_table $(srcdir)/JavaScriptCore/parser/Keywords.table @@ -586,7 +585,7 @@ JavaScriptCore/pcre/chartables.c: $(srcdir)/JavaScriptCore/pcre/dftables $(AM_V_GEN)$(PERL) $^ $@ bin_PROGRAMS += \ - Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ + Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) noinst_PROGRAMS += \ Programs/jsc \ @@ -616,6 +615,7 @@ Programs_minidom_CFLAGS = \ Programs_minidom_LDADD = \ libJavaScriptCore.la \ + $(WINMM_LIBS) \ -lm \ -lstdc++ @@ -624,8 +624,8 @@ Programs_minidom_LDFLAGS = \ -no-fast-install # jsc -Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@: Programs/jsc - $(AM_V_GEN)cp -f Programs/jsc Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@ +Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT): Programs/jsc$(EXEEXT) + $(AM_V_GEN)cp -f Programs/jsc$(EXEEXT) Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD = Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_SOURCES = @@ -644,7 +644,8 @@ Programs_jsc_CXXFLAGS = \ $(UNICODE_CFLAGS) Programs_jsc_LDADD = \ - libJavaScriptCore.la + libJavaScriptCore.la \ + $(WINMM_LIBS) EXTRA_DIST += \ JavaScriptCore/AUTHORS \ |