...
 
Commits (2)
......@@ -9,8 +9,11 @@ ROOT_CLING_FLAGS = -f $@ -noIncludePaths -inlineInputHeader -s $(TARGET) -rmf $
ROOT_CXXFLAGS := $(shell root-config --cflags)
ROOT_GLIBS := $(shell root-config --glibs)
CFLAGS = -O2 -g -Wall -fPIC $(DEPFLAGS)
CXXFLAGS = $(ROOT_CXXFLAGS) -Wall -g -O2 -fPIC $(DEPFLAGS)
MFILE_CFLAGS = # e.g. -I/usr/local/include
MFILE_LDFLAGS = # e.g. -L /opt/lib64
CFLAGS = -O2 -g -Wall -fPIC $(DEPFLAGS) $(MFILE_CFLAGS)
CXXFLAGS = $(ROOT_CXXFLAGS) $(MFILE_CFLAGS) -Wall -g -O2 -fPIC $(DEPFLAGS)
LDFLAGS = -shared
LDLIBS = -lstdc++ $(ROOT_GLIBS) -lX11
DEPFLAGS = -MT $@ -MMD -MP -MF $*.Td
......
......@@ -3,6 +3,7 @@ MODNAME := mfile-root
include ../Makefile.def
LDFLAGS += $(MFILE_LDFLAGS)
LDLIBS += -lmfile
MATOP_SOURCES := $(wildcard matop/*.c)
......
......@@ -18,7 +18,7 @@ class CustomBuild(build):
for module in ['mfile-root', 'fit', 'display']:
dir = os.path.join(self.build_lib, 'hdtv/rootext/', module)
print("Building library in %s" % dir)
subprocess.check_call(['make', '-j', '--silent'], cwd=dir)
subprocess.check_call(['make', '-j'], cwd=dir)
manpages = glob.glob('doc/guide/*.1')
......@@ -48,13 +48,16 @@ setup(
'hdtv': ['share/*'],
'hdtv.rootext': [
'Makefile', 'Makefile.def', 'Makefile.body',
'mfile-root/*.hh', 'mfile-root/*.cc', 'mfile-root/Makefile', 'mfile-root/LinkDef.h',
'mfile-root/libmfile-root.so', 'mfile-root/libmfile-root_rdict.pcm', 'mfile-root/libmfile-root.rootmap',
'mfile-root/matop/*.h', 'mfile-root/matop/*.c',
'mfile-root/*.hh', 'mfile-root/*.cc', 'mfile-root/Makefile',
'mfile-root/LinkDef.h', 'mfile-root/libmfile-root.so',
'mfile-root/libmfile-root_rdict.pcm',
'mfile-root/libmfile-root.rootmap', 'mfile-root/matop/*.h',
'mfile-root/matop/*.c',
'fit/*.hh', 'fit/*.cc', 'fit/Makefile', 'fit/LinkDef.h',
'fit/libfit.so', 'fit/libfit_rdict.pcm', 'fit/libfit.rootmap',
'display/*.hh', 'display/*.cc', 'display/Makefile', 'display/LinkDef.h',
'display/libdisplay.so', 'display/libdisplay_rdict.pcm', 'display/libdisplay.rootmap',
'display/*.hh', 'display/*.cc', 'display/Makefile',
'display/LinkDef.h', 'display/libdisplay.so',
'display/libdisplay_rdict.pcm', 'display/libdisplay.rootmap',
],
},
data_files=[
......