Permalink
Browse files

merge head

  • Loading branch information...
2 parents 0e7a6bd + a7d8236 commit b5f56c86c1f98718a2e28bf2a9ea16a4aa3e44f9 @fishbar fishbar committed Jun 28, 2012
Showing with 938 additions and 172 deletions.
  1. +1 −1 Makefile.am
  2. +10 −13 Makefile.in
  3. +899 −0 Makefile.node
  4. +21 −9 Readme.md
  5. +3 −0 build.sh
  6. +2 −149 jscoverage.c
  7. +2 −0 jscoverage.cpp
View
@@ -34,7 +34,7 @@ jscoverage_SOURCES = encoding.c encoding.h \
highlight.c highlight.h \
instrument.c instrument.h \
instrument-js.cpp instrument-js.h \
- jscoverage.cpp global.h \
+ jscoverage.c global.h \
resource-manager.c resource-manager.h \
stream.c stream.h \
util.c util.h \
View
@@ -31,15 +31,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-### for node.js module
-ifeq ($(NODE_PATH),)
- NODE_PATH = /usr/local
-endif
-ifeq ($(EXTRA_CXXFLAGS),)
- EXTRA_CXXFLAGS = -I $(NODE_INCLUDE) -g -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall
-endif
-##########
VPATH = @srcdir@
UNAME := $(shell uname)
pkgdatadir = $(datadir)/@PACKAGE@
@@ -105,14 +97,17 @@ DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CXXFLAGS) -fPIC
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(EXTRA_CXXFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) -fPIC
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS)
CXXLD = $(CXX)
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
- -shared -fPic -o $@
+ -o $@
+
+
+
SOURCES = $(generate_resources_SOURCES) $(jscoverage_SOURCES) \
$(jscoverage_server_SOURCES)
DIST_SOURCES = $(generate_resources_SOURCES) $(jscoverage_SOURCES) \
@@ -265,12 +260,13 @@ jscoverage_SOURCES = encoding.c encoding.h \
highlight.c highlight.h \
instrument.c instrument.h \
instrument-js.cpp instrument-js.h \
- jscoverage.cpp global.h \
+ jscoverage.c global.h \
resource-manager.c resource-manager.h \
stream.c stream.h \
util.c util.h \
$(resources)
+
jscoverage_LDADD = js/obj/libjs.a -lm @LIBICONV@ @EXTRA_TIMER_LIBS@
jscoverage_server_SOURCES = http-connection.c \
http-exchange.c \
@@ -294,7 +290,8 @@ dist_man_MANS = jscoverage.1 jscoverage-server.1
CLEANFILES = *.gcno *.exe resources.c *~
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
- mv ./jscoverage ./jscoverage.node
+
+
.SUFFIXES:
.SUFFIXES: .c .cpp .o .obj
am--refresh:
Oops, something went wrong.

0 comments on commit b5f56c8

Please sign in to comment.