diff --git a/Makefile b/Makefile index 2a2623d0c643fd0c30b905cdf7c7556484739838..e622ba357730e1449a98e20811e83d02bfdf434c 100644 --- a/Makefile +++ b/Makefile @@ -192,8 +192,8 @@ endif src/THcInterface.d: $(HDR_COMPILEDATA) -hcana: src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB) - $(LD) $(LDFLAGS) $< $(HALLALIBS) $(EVIOLIB) -L. -lHallC $(CCDBLIBS) \ +hcana: src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB) + $(LD) $(LDFLAGS) $< -lHallC $(HALLALIBS) $(EVIOLIB) -L. $(CCDBLIBS) \ $(GLIBS) -o $@ $(USERLIB): $(HDR) $(OBJS) diff --git a/SConstruct b/SConstruct index 8b13dffdf8af1eab9b6c7c4eedd0469e5feddedb..b5a7758873abd2c922ea1152814b3a89ef4458a7 100644 --- a/SConstruct +++ b/SConstruct @@ -195,8 +195,8 @@ directorylist = ['./','src','podd','podd/src','podd/hana_decode'] baseenv.Append(SHLIBSUFFIX ='.'+baseenv.subst('$VERSION')) pbaseenv=baseenv.Clone() -pbaseenv.Append(LIBS=[eviolib,hallclib,hallalib,dclib]) -baseenv.Append(LIBS=[eviolib,hallalib,dclib]) +pbaseenv.Prepend(LIBS=[hallclib,hallalib,dclib,eviolib]) +baseenv.Prepend(LIBS=[hallalib,dclib,eviolib]) Export('pbaseenv') SConscript(dirs = directorylist,name='SConscript.py',exports='baseenv')