diff --git a/Makefile b/Makefile index e8313c678d9f7a9726bb99e94515f83e1a42abcb..ce2a10f8351c1712de0a824fb10a7f2f329e5174 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,7 @@ -############################################################################# -# FILENAME: Makefile -# -# PURPOSE: Makefile for GQ GMC driver and sample program. -# -# AUTHOR: Phil Gillaspy -# -# UPDATE: 05-10-2012 -# -############################################################################# - include Defines.mk LIBRARIES = $(LIBS)/libGQGMC.a -PROGRAMS = $(BIN)/gqgmc_gui $(BIN)/gqgmc +PROGRAMS = $(BIN)/gqgmc include Targets.mk @@ -21,25 +10,13 @@ gq_source = gqgmc.cc # replace .cc with .o (object) gq_object = $(gq_source:%.cc=$(OBJ)/%.o) -gui_src = plotter.cc moc_plotter.cc -# replace .cc with .o (object) -gui_object = $(gui_src:%.cc=$(OBJ)/%.o) - $(BASE)/libs/libGQGMC.a .LIBRARY : $(gq_object) ar ruv $@ $? ranlib $@ -# generate MOC file -moc_plotter.cc: plotter.hh - $(MOC) $(DEFINES) $(QT_INC) $< -o $@ - $(BIN)/gqgmc: $(OBJ)/main.o $(LIBRARIES) $(LDCPP) $(LDFLAGS) -o $@ $(OBJ)/main.o $(LIBS_LNK) -$(BIN)/gqgmc_gui: $(OBJ)/main_gui.o $(gui_object) $(LIBRARIES) - $(LDCPP) $(LDFLAGS) -o $@ $(OBJ)/main_gui.o $(gui_object) $(LIBS_LNK) - -#all: xmoc xobj libs bin .PHONY: all all: dirs $(BIN)/gqgmc diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bin/gqgmc b/bin/gqgmc deleted file mode 100755 index 12eda978939fe3a16bd05da59f58e5d2a2b5968b..0000000000000000000000000000000000000000 Binary files a/bin/gqgmc and /dev/null differ diff --git a/bin/gqgmc_gui b/bin/gqgmc_gui deleted file mode 100755 index d14a70e8ded6c26243b10372a3120975217cbeaf..0000000000000000000000000000000000000000 Binary files a/bin/gqgmc_gui and /dev/null differ diff --git a/libs/.gitignore b/libs/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/libs/libGQGMC.a b/libs/libGQGMC.a deleted file mode 100644 index 8a015d6a0004dd48c872448bfcc7f76a35e636bb..0000000000000000000000000000000000000000 Binary files a/libs/libGQGMC.a and /dev/null differ diff --git a/obj/.gitignore b/obj/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/obj/gqgmc.o b/obj/gqgmc.o deleted file mode 100644 index 921eccb48743d60d28f56f27477c94868806372d..0000000000000000000000000000000000000000 Binary files a/obj/gqgmc.o and /dev/null differ diff --git a/obj/main.o b/obj/main.o deleted file mode 100644 index b08e8f6065c33491dfbe029dd59759898bce5896..0000000000000000000000000000000000000000 Binary files a/obj/main.o and /dev/null differ diff --git a/obj/main_gui.o b/obj/main_gui.o deleted file mode 100644 index 173fe6316bac2d961365d32be5354f1b7f21d228..0000000000000000000000000000000000000000 Binary files a/obj/main_gui.o and /dev/null differ diff --git a/obj/moc_plotter.o b/obj/moc_plotter.o deleted file mode 100644 index 9e7cd8f17675382c9d7f24a5c36cd8da5ef1fc94..0000000000000000000000000000000000000000 Binary files a/obj/moc_plotter.o and /dev/null differ diff --git a/obj/plotter.o b/obj/plotter.o deleted file mode 100644 index 5bc8c5d169aa1587ea1e871b468c15a1c4023e6f..0000000000000000000000000000000000000000 Binary files a/obj/plotter.o and /dev/null differ