Browse Source

Makefile: use standard variable names for compilers and their flags

Rename the following makefile variables to their standard implicit
equivalents in GNU Make for the sake of clarity:

  C        -> CC
  CPP      -> CXX
  CPPFLAGS -> CXXFLAGS
accumulation-v4.7
Chris Novakovic 7 years ago
committed by Dave Parker
parent
commit
6509b6ab9e
  1. 46
      prism/Makefile
  2. 2
      prism/ext/lpsolve55/Makefile
  3. 2
      prism/src/dd/Makefile
  4. 2
      prism/src/dv/Makefile
  5. 2
      prism/src/hybrid/Makefile
  6. 2
      prism/src/jdd/Makefile
  7. 2
      prism/src/mtbdd/Makefile
  8. 2
      prism/src/odd/Makefile
  9. 6
      prism/src/prism/Makefile
  10. 2
      prism/src/sparse/Makefile

46
prism/Makefile

@ -127,9 +127,9 @@ JAVA_DIR_BACKUP = $(shell \
# Compilers etc. # # Compilers etc. #
################## ##################
C = gcc
CPP = g++
LD = $(CPP)
CC = gcc
CXX = g++
LD = $(CXX)
JAVAC = javac JAVAC = javac
JAVACC = javacc JAVACC = javacc
@ -160,7 +160,7 @@ ifeq ($(OSTYPE),linux)
# Position Independent Code required on AMD64/Itanium # Position Independent Code required on AMD64/Itanium
CUDD_XCFLAGS = -m64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -m64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
BINDISTSUFFIX = linux64 BINDISTSUFFIX = linux64
else else
@ -169,13 +169,13 @@ ifeq ($(OSTYPE),linux)
# Note: We omit the -m64 flag from here since it seems to be unsupported by gcc on IA64 # Note: We omit the -m64 flag from here since it seems to be unsupported by gcc on IA64
CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
BINDISTSUFFIX = linux64 BINDISTSUFFIX = linux64
else else
CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -m32 -malign-double -DHAVE_IEEE_754 -DBSD $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
BINDISTSUFFIX = linux32 BINDISTSUFFIX = linux32
endif endif
@ -194,7 +194,7 @@ endif
ifeq ($(OSTYPE),solaris) ifeq ($(OSTYPE),solaris)
CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -mcpu=ultrasparc -DHAVE_IEEE_754 -DUNIX100 -DEPD_BIG_ENDIAN $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
BINDISTSUFFIX = solaris BINDISTSUFFIX = solaris
BIN_TARGETS=prism.linux xprism.linux BIN_TARGETS=prism.linux xprism.linux
@ -209,21 +209,21 @@ endif
# Cygwin # Cygwin
ifeq ($(OSTYPE),cygwin) ifeq ($(OSTYPE),cygwin)
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
C = /usr/bin/x86_64-w64-mingw32-gcc
CPP = /usr/bin/x86_64-w64-mingw32-g++
CC = /usr/bin/x86_64-w64-mingw32-gcc
CXX = /usr/bin/x86_64-w64-mingw32-g++
CUDD_XCFLAGS = -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=4 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++ CUDD_XCFLAGS = -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=4 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
# need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11) # need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11)
CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive
BINDISTSUFFIX = win64 BINDISTSUFFIX = win64
else else
C = /usr/bin/i686-w64-mingw32-gcc
CPP = /usr/bin/i686-w64-mingw32-g++
CC = /usr/bin/i686-w64-mingw32-gcc
CXX = /usr/bin/i686-w64-mingw32-g++
CUDD_XCFLAGS = -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++ CUDD_XCFLAGS = -march=i686 -malign-double -DHAVE_IEEE_754 -DHAVE_GETRLIMIT=0 -DRLIMIT_DATA_DEFAULT=268435456 -DHAVE_SYS_RESOURCE_H=0 -DHAVE_SYS_WAIT_H=0 $(DEBUG) $(WARNINGS) -static-libgcc -static-libstdc++
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
# need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11) # need -DWIN32 for lpsolve (WIN32 is only defined by mingw/gcc without --std=c++11)
CPPFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 -DWIN32 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,--add-stdcall-alias -Wl,-Bstatic,--whole-archive -lpthread -Wl,-Bdynamic,--no-whole-archive
BINDISTSUFFIX = win32 BINDISTSUFFIX = win32
endif endif
@ -243,14 +243,14 @@ ifeq ($(OSTYPE),darwin)
ifeq ($(ARCH),x86_64) ifeq ($(ARCH),x86_64)
CUDD_XCFLAGS = -arch x86_64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -fno-common $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -arch x86_64 -fPIC -DPIC -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=8 -DSIZEOF_LONG=8 -fno-common $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
BINDISTSUFFIX = osx64 BINDISTSUFFIX = osx64
BIN_TARGETS=prism.darwin64 xprism.linux BIN_TARGETS=prism.darwin64 xprism.linux
else else
CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG) $(WARNINGS) CUDD_XCFLAGS = -arch i386 -DHAVE_IEEE_754 -DBSD -fno-common $(DEBUG) $(WARNINGS)
CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) CFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE)
CPPFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
CXXFLAGS = --std=c++11 $(CUDD_XCFLAGS) $(OPTIMISE)
LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first LDFLAGS = $(CUDD_XCFLAGS) $(OPTIMISE) -Wl,-search_paths_first
BINDISTSUFFIX = osx32 BINDISTSUFFIX = osx32
BIN_TARGETS=prism.darwin32 xprism.linux BIN_TARGETS=prism.darwin32 xprism.linux
@ -320,7 +320,7 @@ cuddpackage: checks
@(if [ ! -h $(CUDD_DIR) ]; then \ @(if [ ! -h $(CUDD_DIR) ]; then \
echo Making cudd ...; \ echo Making cudd ...; \
cd $(CUDD_DIR) && \ cd $(CUDD_DIR) && \
$(MAKE) C="$(C)" CC="$(C)" CPP="$(CPP)" CXX="$(CPP)" \
$(MAKE) CC="$(CC)" CXX="$(CXX)" \
XCFLAGS="$(CUDD_XCFLAGS)"; \ XCFLAGS="$(CUDD_XCFLAGS)"; \
else \ else \
echo Skipping cudd make since it is a symlink...; \ echo Skipping cudd make since it is a symlink...; \
@ -330,7 +330,7 @@ cuddpackage: checks
cuddpackageforce: checks cuddpackageforce: checks
@echo Making cudd ...; \ @echo Making cudd ...; \
cd $(CUDD_DIR) && \ cd $(CUDD_DIR) && \
$(MAKE) C="$(C)" CC="$(C)" CPP="$(CPP)" \
$(MAKE) CC="$(CC)" CXX="$(CXX)" \
XCFLAGS="$(CUDD_XCFLAGS)"; XCFLAGS="$(CUDD_XCFLAGS)";
# Use this to force a rebuild (with javacc) of the main parser # Use this to force a rebuild (with javacc) of the main parser
@ -351,11 +351,11 @@ extpackages: checks
$(MAKE) \ $(MAKE) \
OSTYPE="$(OSTYPE)" \ OSTYPE="$(OSTYPE)" \
ARCH="$(ARCH)" \ ARCH="$(ARCH)" \
C="$(C)" \
CPP="$(CPP)" \
CC="$(CC)" \
CXX="$(CXX)" \
LD="$(LD)" \ LD="$(LD)" \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)" \ LDFLAGS="$(LDFLAGS)" \
SHARED="$(SHARED)" \ SHARED="$(SHARED)" \
LIBPREFIX="$(LIBPREFIX)" \ LIBPREFIX="$(LIBPREFIX)" \
@ -383,13 +383,13 @@ make_dirs:
JAVA_INCLUDES="$(JAVA_INCLUDES)" \ JAVA_INCLUDES="$(JAVA_INCLUDES)" \
JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" \ JAVA_JNI_H_DIR="$(JAVA_JNI_H_DIR)" \
JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" \ JAVA_JNI_MD_H_DIR="$(JAVA_JNI_MD_H_DIR)" \
C="$(C)" \
CPP="$(CPP)" \
CC="$(CC)" \
CXX="$(CXX)" \
LD="$(LD)" \ LD="$(LD)" \
JAVAC="$(JAVAC) $(JFLAGS)" \ JAVAC="$(JAVAC) $(JFLAGS)" \
JAVACC="$(JAVACC)" \ JAVACC="$(JAVACC)" \
CFLAGS="$(CFLAGS)" \ CFLAGS="$(CFLAGS)" \
CPPFLAGS="$(CPPFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
LDFLAGS="$(LDFLAGS)" \ LDFLAGS="$(LDFLAGS)" \
SHARED="$(SHARED)" \ SHARED="$(SHARED)" \
EXE="$(EXE)" \ EXE="$(EXE)" \

2
prism/ext/lpsolve55/Makefile

@ -38,7 +38,7 @@ checks:
cp bin/$(BINDISTSUFFIX)/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib; \ cp bin/$(BINDISTSUFFIX)/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib; \
else \ else \
(cd src/lp_solve_5.5/lpsolve55 && \ (cd src/lp_solve_5.5/lpsolve55 && \
ARCH=$(ARCH) c=$(C) sh -x $(LPSOLVE55_BUILD) \
ARCH=$(ARCH) c=$(CC) sh -x $(LPSOLVE55_BUILD) \
) && mv lib/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib/; \ ) && mv lib/$(LIBPREFIX)lpsolve55$(LIBSUFFIX) ../../lib/; \
fi) fi)

2
prism/src/dd/Makefile

@ -47,7 +47,7 @@ $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test$(EXE): $(PRISM_DIR_REL)/$(
$(LD) $(LDFLAGS) -o $@ $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test.o -L$(PRISM_DIR_REL)/$(PRISM_LIB_DIR) -ldd $(LD) $(LDFLAGS) -o $@ $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test.o -L$(PRISM_DIR_REL)/$(PRISM_LIB_DIR) -ldd
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dd$(LIBSUFFIX) $(O_FILES) $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test$(EXE) @rm -f $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dd$(LIBSUFFIX) $(O_FILES) $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/dd_test$(EXE)

2
prism/src/dv/Makefile

@ -55,7 +55,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX): $(O_FILES)
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)dv$(LIBSUFFIX) $(O_FILES)

2
prism/src/hybrid/Makefile

@ -58,7 +58,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX): $(O_FILES
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismhybrid$(LIBSUFFIX) $(O_FILES)

2
prism/src/jdd/Makefile

@ -53,7 +53,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX): $(O_FILES)
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)jdd$(LIBSUFFIX) $(O_FILES)

2
prism/src/mtbdd/Makefile

@ -57,7 +57,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX): $(O_FILES)
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismmtbdd$(LIBSUFFIX) $(O_FILES)

2
prism/src/odd/Makefile

@ -53,7 +53,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX): $(O_FILES)
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)odd$(LIBSUFFIX) $(O_FILES)

6
prism/src/prism/Makefile

@ -51,14 +51,14 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prism$(LIBSUFFIX): $(O_FILES)
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE): ngprism.c $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/ngprism$(EXE): ngprism.c
# For ngprism on Windows, link winsocket library (ws2_32) # For ngprism on Windows, link winsocket library (ws2_32)
@if [ "$(EXE)" = "" ]; then \ @if [ "$(EXE)" = "" ]; then \
$(C) $(LDFLAGS) $(CFLAGS) -o $@ $<; \
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<; \
else \ else \
$(C) $(LDFLAGS) $(CFLAGS) -o $@ $< -lws2_32; \
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $< -lws2_32; \
fi; fi;
clean: checks clean: checks

2
prism/src/sparse/Makefile

@ -59,7 +59,7 @@ $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX): $(O_FILES
$(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES) $(LD) $(SHARED) $(LDFLAGS) -o $@ $(O_FILES) $(LIBRARIES)
$(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc $(PRISM_DIR_REL)/$(PRISM_OBJ_DIR)/$(THIS_DIR)/%.o: %.cc
$(CPP) $(CPPFLAGS) -c $< -o $@ $(INCLUDES)
$(CXX) $(CXXFLAGS) -c $< -o $@ $(INCLUDES)
clean: checks clean: checks
@rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX) $(O_FILES) @rm -f $(CLASS_FILES) $(PRISM_DIR_REL)/$(PRISM_LIB_DIR)/$(LIBPREFIX)prismsparse$(LIBSUFFIX) $(O_FILES)

Loading…
Cancel
Save