Commit e2249d5b authored by Edward Vigmond's avatar Edward Vigmond
Browse files

Tuned Makefiles

parent e4bd29ed
......@@ -2,6 +2,7 @@
#define IGBREADER_H
#include "DataReader.h"
#include <unistd.h>
template<class T>
class IGBreader : public DataReader<T>
......
......@@ -2,6 +2,8 @@ HOSTMACHINE := $(shell uname)
HDF5API_ROOT := ./hdf5api
FLTK_INC := $(shell fltk-config --use-gl --cxxflags)
FLTK_LD_FLAGS := $(shell fltk-config --use-images --use-gl --ldflags)
COMMON_INC := -I. -O0 -g -DOBJ_CLASS -D_REENTRANT -MMD -DNOMINMAX
ifdef HDF5
......@@ -13,18 +15,11 @@ LIB_CH5 :=
LIB_HDF5 :=
endif
FLTK_INC := $(shell fltk-config --use-gl --cxxflags)
FLTK_LD_FLAGS := $(shell fltk-config --use-images --use-gl --ldflags)
COMMON_LIBS = -lpng -lpthread -lm -lz $(LIB_HDF5)
LIBS = -L$(HDF5API_ROOT)/lib $(FLTK_LD_FLAGS) $(COMMON_LIBS)
LDFLAGS = -L$(HDF5API_ROOT)/lib
ifeq ($(HOSTMACHINE),Darwin)
CXXFLAGS = -I/usr/X11R6/include -I$(HDF5API_ROOT)/src $(FLTK_INC) $(COMMON_INC)
else
CXXFLAGS = -I$(HDF5API_ROOT)/src $(FLTK_INC) $(COMMON_INC)
endif
CPPFLAGS = $(CFLAGS) -g
ifdef ENABLE_LOGGING
......
......@@ -4,8 +4,7 @@ CXXFLAGS := -g -O0 -Wall -I$(HDF5API_ROOT)/src
OBJ1 := $(patsubst %.c, %.o, $(wildcard *.c))
OBJ1 += $(patsubst %.cc, %.o, $(wildcard *.cc))
OBJS := $(filter-out cmdline.o, $(OBJ1) ) #remove cmdline.o if present
OBJS += cmdline.o #now make sure it is there only once
OBJS := cmdline.o $(filter-out cmdline.o, $(OBJ1) )
BINNAME := package_data
BINPATH := $(BINNAME)
......@@ -20,7 +19,7 @@ all: $(BINPATH)
$(BINPATH): $(OBJS)
$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(BINPATH)
cmdline.c: pd.ggo
cmdline.h cmdline.c: pd.ggo
gengetopt -u < pd.ggo
clean:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment