Revision 1083 trunk/src/GNUmakefile

GNUmakefile (revision 1083)
48 48
SAFLP_LINAD99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-linad99-,$(OBJ1) $(OBJ2) $(OBJ3) $(OBJ4)))
49 49

  
50 50
include nh99/objects.lst
51
OPTLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-nh99-,$(OBJ6)))
52
SAFLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-nh99-,$(OBJ6)))
51
OPTLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-nh99-,$(filter-out dfqromb.obj,$(OBJ6))))
52
SAFLP_NH99_OBJS=$(sort $(addprefix ../build/objects/dist/saflp-nh99-,$(filter-out dfqromb.obj,$(OBJ6))))
53 53

  
54 54
include tools99/objects.lst
55 55
OPTLP_TOOLS99_OBJS=$(sort $(addprefix ../build/objects/dist/optlp-tools99-,$(OBJ7)))
......
160 160
	$(AR) -rs ${DISK}/lib/libadmbo.a ../build/objects/dist/optlp-sparse-*.obj
161 161
endif
162 162

  
163
../build/objects/dist/saflp-nh99-dfqromb.obj: nh99/dfqromb.cpp
164
ifneq ($(CXX),CC)
165
	$(CXX) -c -DSAFE_ALL $(CXXFLAGS) -o$@ $<
166
endif
167

  
168
../build/objects/dist/optlp-nh99-dfqromb.obj: nh99/dfqromb.cpp
169
ifneq ($(CXX),CC)
170
	$(CXX) -c -DOPT_LIB $(CXXFLAGS) -o$@ $<
171
endif
172

  
173 163
../build/objects/dist/optlp-nh99-banner.obj: nh99/banner.cpp
174 164
	$(CXX) -c -DOPT_LIB $(CXXFLAGS) -DADMB_VERSION=$(shell cat ../../VERSION) -DADMB_REVISION=$(shell test -e ../../REVISION && cat ../../REVISION) -o$@ $<
175 165

  

Also available in: Unified diff