Pike example makefiles tweaks for consistency with other languages. Attempt to add runtime tests to 'make check' - untested.

This commit is contained in:
William S Fulton 2013-04-15 22:49:12 +01:00
commit 9a6167822b
7 changed files with 39 additions and 26 deletions

View file

@ -1048,6 +1048,8 @@ PIKE_CFLAGS = @PIKECCDLFLAGS@ -DHAVE_CONFIG_H
PIKE_INCLUDE = @PIKEINCLUDE@
PIKE_LIB = @PIKELIB@
PIKE_DLNK = @PIKEDYNAMICLINKING@
PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS)
PIKE_SCRIPT = $(RUNME).pike
# ----------------------------------------------------------------
# Build a C dynamically loadable module
@ -1074,8 +1076,6 @@ pike_cpp: $(SRCS)
# library file
# -----------------------------------------------------------------
PIKE_LIBOPTS = @PIKELINK@ @LIBS@ $(SYSLIBS)
pike_static: $(SRCS)
$(SWIG) -pike -lembed.i $(SWIGOPT) $(INTERFACEPATH)
$(CC) $(CFLAGS) $(PIKE_CFLAGS) @LINKFORSHARED@ $(ISRCS) $(SRCS) $(INCLUDES) \
@ -1086,6 +1086,13 @@ pike_cpp_static: $(SRCS)
$(CXX) $(CFLAGS) $(PIKE_CFLAGS) $(ICXXSRCS) $(SRCS) $(CXXSRCS) $(INCLUDES) \
$(PIKE_INCLUDE) $(LIBS) -L$(PIKE_LIB) $(PIKE_LIBOPTS) -o $(TARGET)
# -----------------------------------------------------------------
# Run pike example
# -----------------------------------------------------------------
pike_run:
$(RUNTOOL) $(PIKE) $(PIKE_SCRIPT) $(RUNPIPE)
# -----------------------------------------------------------------
# Version display
# -----------------------------------------------------------------

View file

@ -5,7 +5,10 @@ TARGET = example
INTERFACE = example.i
LIBS = -lm
all:
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp
@ -15,5 +18,3 @@ static:
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all

View file

@ -4,15 +4,16 @@ SRCS =
TARGET = example
INTERFACE = example.i
all::
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike
static::
static:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='mypike' INTERFACE='$(INTERFACE)' pike_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all

View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i
LIBS = -lm
all::
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mypike' INTERFACE='$(INTERFACE)' pike_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all

View file

@ -5,15 +5,16 @@ TARGET = example
INTERFACE = example.i
LIBS = -lstdc++ -lm
all::
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp
static::
static:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
TARGET='mypike' INTERFACE='$(INTERFACE)' pike_cpp_static
clean::
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all

View file

@ -4,7 +4,10 @@ SRCS = example.c
TARGET = example
INTERFACE = example.i
all:
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile SRCS='$(SRCS)' SWIG='$(SWIG)' \
TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike
@ -14,5 +17,3 @@ static:
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all

View file

@ -6,7 +6,10 @@ INTERFACE = example.i
LIBS = -lm
SWIGOPT =
all:
check: build
$(MAKE) -f $(TOP)/Makefile pike_run
build:
$(MAKE) -f $(TOP)/Makefile CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' pike_cpp
@ -16,5 +19,3 @@ static:
clean:
$(MAKE) -f $(TOP)/Makefile pike_clean
check: all