jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Octave: simplify Examples/octave/example.mk"

Browse source 
This reverts commit 6c04378e20.

Reverting a series of Octave commits for re-applying again without
incorrect whitespace changes.
This commit is contained in:
William S Fulton 2014-10-09 19:34:04 +01:00
commit 97f6731e3c
1 changed files with 16 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Examples/octave/example.mk
View file

@ -6,34 +6,27 @@ SWIG = $(TOP)/../preinst-swig
TARGET = swigexample TARGET = swigexample
INTERFACE = example.i INTERFACE = example.i
BUILDCMD = \
$(MAKE) -f $(TOP)/Makefile \
SRCDIR='$(SRCDIR)' \
SWIG='$(SWIG)' \
INTERFACE='$(INTERFACE)'
ifneq (,$(SRCS))
BUILDCMD += SRCS='$(SRCS)'
BUILDTARGET = octave
else
BUILDCMD += CXXSRCS='$(CXXSRCS)'
BUILDTARGET = octave_cpp
endif
check: build check: build
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' octave_run $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' octave_run
build: build:
$(BUILDCMD) SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' $(BUILDTARGET) ifneq (,$(SRCS))
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
ifneq (,$(TARGET2)$(SWIGOPT2)) SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave
else
check: build2 $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT)' TARGET='$(TARGET)' INTERFACE='$(INTERFACE)' octave_cpp
build2:
$(BUILDCMD) SWIGOPT='$(SWIGOPT2)' TARGET='$(TARGET2)' $(BUILDTARGET)
endif endif
ifneq (,$(TARGET2)$(SWIGOPT2))
ifneq (,$(SRCS))
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' SRCS='$(SRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT2)' TARGET='$(TARGET2)' INTERFACE='$(INTERFACE)' octave
else
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' CXXSRCS='$(CXXSRCS)' SWIG='$(SWIG)' \
SWIGOPT='$(SWIGOPT2)' TARGET='$(TARGET2)' INTERFACE='$(INTERFACE)' octave_cpp
endif
endif
clean: clean:
$(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' octave_clean $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' octave_clean