Integrate Register Level Programming and add counter source selection

r1196 | dcl | 2006-10-26 13:09:31 +1000 (Thu, 26 Oct 2006) | 2 lines

site_ansto/hardsup/Monitor/Makefile

@@ -3,28 +3,41 @@ SHELL = /bin/sh
 CC = gcc
 CXX = g++
 LD = $(CXX)
-LIBS = nidaqmx
-LIBFLAGS = -l$(LIBS)
-TARGET = Monitor
-PULSER = Pulser
-
-OBJS = $(TARGET).o params.o utility.o sock.o display.o cntr.o hctr.o
-
 CDEBUG = -ggdb3 -Wall
 LDFLAGS += -g
+TARGETS = Monitor
 
-CFLAGS += $(CDEBUG)
-CXXFLAGS += $(CDEBUG)
+OBJS = Monitor.o params.o utility.o sock.o display.o cntr.o hctr.o
+ifeq ($(MAKECMDGOALS),rlp)
+OBJECTS =
+LIBS = 
+LIBFLAGS = 
+DDK_DIR = /home/dcl/nitest/nimhddk_linux26
+OBJECTS += $(DDK_DIR)/osiBus.o
+OBJECTS += $(DDK_DIR)/Linux26/osiUserCode.o
+TIO_DIR = /home/dcl/nitest/NI660x
+OBJECTS += $(TIO_DIR)/tTIO.o
+IFLAGS = -I$(DDK_DIR)
+IFLAGS += -I$(TIO_DIR)/ChipObjects/
+CXXFLAGS += -DkLittleEndian=1 -DREGISTER_LEVEL_PROGRAMMING=1
+LIBFLAGS += $(OBJECTS)
+CXXFLAGS += $(IFLAGS)
+else
+LIBS = nidaqmx
+LIBFLAGS = $(foreach lib,$(LIBS),-l$(lib))
+endif
 
-all: $(TARGET) $(PULSER)
+all: $(TARGETS)
+
+rlp: all
 
 clean:
-	rm -f $(OBJS) $(TARGET) $(PULSER).o $(PULSER) core
+	rm -f $(OBJS) Monitor Pulser.o Pulser core
 
-$(TARGET) : $(OBJS)
+Monitor : $(OBJS)
 	$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBFLAGS) -ggdb3
 
-$(TARGET).o: $(TARGET).c $(TARGET).h params.h utility.h sock.h cntr.h
+Monitor.o: Monitor.c Monitor.h params.h utility.h sock.h cntr.h
 
 cntr.o: cntr.c cntr.h params.h sock.h
 
@@ -38,10 +51,13 @@ sock.o: sock.c sock.h utility.h display.h cntr.h
 
 utility.o: utility.c utility.h
 
-$(PULSER) : $(PULSER).o
-	$(LD) $(LDFLAGS) -o $@ $(PULSER).o $(LIBFLAGS) -ggdb3
+Pulser : Pulser.c
+	$(CXX) -o $@ $< $(CXXFLAGS) $(CDEBUG) $(LDFLAGS) $(LIBFLAGS)
 
 %.o : %.c
-	$(CXX) -c -o $@ $< $(CXXFLAGS)
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(CDEBUG)
+
+%.o : %.cpp
+	$(CXX) -c -o $@ $< $(CXXFLAGS) $(CDEBUG)
 
 # vim: noexpandtab ts=8 sts=8