Skip to content
Snippets Groups Projects
Commit c97a1c7a authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

Fix library order so that linking works on Ubuntu

  Fixed for make and scons
  Put libHallC before libHallA before root libs
parent 4d8583aa
No related branches found
No related tags found
No related merge requests found
...@@ -192,8 +192,8 @@ endif ...@@ -192,8 +192,8 @@ endif
src/THcInterface.d: $(HDR_COMPILEDATA) src/THcInterface.d: $(HDR_COMPILEDATA)
hcana: src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB) hcana: src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB)
$(LD) $(LDFLAGS) $< $(HALLALIBS) $(EVIOLIB) -L. -lHallC $(CCDBLIBS) \ $(LD) $(LDFLAGS) $< -lHallC $(HALLALIBS) $(EVIOLIB) -L. $(CCDBLIBS) \
$(GLIBS) -o $@ $(GLIBS) -o $@
$(USERLIB): $(HDR) $(OBJS) $(USERLIB): $(HDR) $(OBJS)
......
...@@ -195,8 +195,8 @@ directorylist = ['./','src','podd','podd/src','podd/hana_decode'] ...@@ -195,8 +195,8 @@ directorylist = ['./','src','podd','podd/src','podd/hana_decode']
baseenv.Append(SHLIBSUFFIX ='.'+baseenv.subst('$VERSION')) baseenv.Append(SHLIBSUFFIX ='.'+baseenv.subst('$VERSION'))
pbaseenv=baseenv.Clone() pbaseenv=baseenv.Clone()
pbaseenv.Append(LIBS=[eviolib,hallclib,hallalib,dclib]) pbaseenv.Prepend(LIBS=[hallclib,hallalib,dclib,eviolib])
baseenv.Append(LIBS=[eviolib,hallalib,dclib]) baseenv.Prepend(LIBS=[hallalib,dclib,eviolib])
Export('pbaseenv') Export('pbaseenv')
SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv') SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment