Attachment #219603 for bug #248345

Lines 66-71 Link Here

(-)mpqc-2.3.1.orig/src/lib/chemistry/molecule/Makefile (+6 lines)
66	interface:: $(DEPENDINCLUDE)	66	interface:: $(DEPENDINCLUDE)
67		67
68	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/LIBS.h)	68	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/LIBS.h)
		69	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCcontainer.la \
		70	$(SRCDIR)/$(TOPDIR)/lib/libSCclass.la \
		71	$(SRCDIR)/$(TOPDIR)/lib/libSCkeyval.la \
		72	$(SRCDIR)/$(TOPDIR)/lib/libSCoptimize.la \
		73	$(SRCDIR)/$(TOPDIR)/lib/libSCscmat.la \
		74	$(SRCDIR)/$(TOPDIR)/lib/libSCsymmetry.la
69		75
70	LD = $(CXX)	76	LD = $(CXX)
71		77

Lines 48-53 Link Here

(-)mpqc-2.3.1.orig/src/lib/chemistry/qc/wfn/Makefile (+5 lines)
48		48
49	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/../dft/LIBS.h)	49	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/../dft/LIBS.h)
50		50
		51	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCisosurf.la \
		52	$(SRCDIR)/$(TOPDIR)/lib/libSCsolvent.la \
		53	$(SRCDIR)/$(TOPDIR)/lib/libSCbasis.la \
		54	$(SRCDIR)/$(TOPDIR)/lib/libSCintv3.la
		55
51	wfntest:: wfntest.$(OBJSUF) $(LIBS)	56	wfntest:: wfntest.$(OBJSUF) $(LIBS)
52	$(LTLINK) $(CXX) $(LDFLAGS) -o wfntest $^ $(SYSLIBS) $(LTLINKBINOPTS)	57	$(LTLINK) $(CXX) $(LDFLAGS) -o wfntest $^ $(SYSLIBS) $(LTLINKBINOPTS)
53		58

Lines 52-57 Link Here

(-)mpqc-2.3.1.orig/src/lib/chemistry/qc/intv3/Makefile (+2 lines)
52	LIBOBJ = $(LIBSRC:%.c=%.$(OBJSUF))	52	LIBOBJ = $(LIBSRC:%.c=%.$(OBJSUF))
53	LIBOBJ := $(LIBOBJ:%.cc=%.$(OBJSUF))	53	LIBOBJ := $(LIBOBJ:%.cc=%.$(OBJSUF))
54		54
		55	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCoint3.la
		56
55	DISTFILES = $(TESTCSRC) $(INC) atoms.sgen Makefile LIBS.h	57	DISTFILES = $(TESTCSRC) $(INC) atoms.sgen Makefile LIBS.h
56		58
57	DEPENDINCLUDE = $(INC) $(GENINC) $(SGENINC)	59	DEPENDINCLUDE = $(INC) $(GENINC) $(SGENINC)

Lines 44-49 Link Here

(-)mpqc-2.3.1.orig/src/lib/chemistry/qc/mbpt/Makefile (+1 lines)
44	CSRCS = bzerofast.c	44	CSRCS = bzerofast.c
45		45
46	LIBOBJ= $(CXXSRCS:%.cc=%.$(OBJSUF)) $(CSRCS:%.c=%.$(OBJSUF))	46	LIBOBJ= $(CXXSRCS:%.cc=%.$(OBJSUF)) $(CSRCS:%.c=%.$(OBJSUF))
		47	LIBADD= $(SRCDIR)/$(TOPDIR)/lib/libSCsymmetry.la
47		48
48	default:: $(DEPENDINCLUDE)	49	default:: $(DEPENDINCLUDE)
49		50

Lines 59-64 Link Here

(-)mpqc-2.3.1.orig/src/lib/chemistry/qc/basis/Makefile (+1 lines)
59	DISTFILES = $(CXXSRC) $(INC) Makefile $(TESTSRC) $(TESTFILES)	59	DISTFILES = $(CXXSRC) $(INC) Makefile $(TESTSRC) $(TESTFILES)
60		60
61	LIBOBJ= $(CXXSRC:%.cc=%.$(OBJSUF))	61	LIBOBJ= $(CXXSRC:%.cc=%.$(OBJSUF))
		62	LIBADD = $(SYSLIBS)
62		63
63	default:: $(DEPENDINCLUDE)	64	default:: $(DEPENDINCLUDE)
64		65

Lines 75-80 Link Here

(-)mpqc-2.3.1.orig/src/lib/math/scmat/Makefile (+2 lines)
75	DISTFILES = $(CXXSRC) $(INC) scmat.h $(WEBSRC) Makefile LIBS.h \	75	DISTFILES = $(CXXSRC) $(INC) scmat.h $(WEBSRC) Makefile LIBS.h \
76	$(TESTSRC) $(TESTFILES)	76	$(TESTSRC) $(TESTFILES)
77		77
		78	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCgroup.la $(SYSLIBS)
		79
78	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/LIBS.h)	80	LIBS = $(shell $(LISTLIBS) $(INCLUDE) $(SRCDIR)/LIBS.h)
79		81
80	matrixtest:	82	matrixtest:

Lines 41-46 Link Here

(-)mpqc-2.3.1.orig/src/lib/util/class/Makefile (+1 lines)
41		41
42	BIN_OR_LIB = LIB	42	BIN_OR_LIB = LIB
43	TARGET_TO_MAKE = libSCclass	43	TARGET_TO_MAKE = libSCclass
		44	LIBADD = $(SYSLIBS)
44		45
45	TESTCXXSRC = classtest.cc scextest.cc	46	TESTCXXSRC = classtest.cc scextest.cc
46	DISTFILES = $(CXXSRC) $(INC) Makefile LIBS.h $(TESTCXXSRC)	47	DISTFILES = $(CXXSRC) $(INC) Makefile LIBS.h $(TESTCXXSRC)

Lines 50-55 Link Here

(-)mpqc-2.3.1.orig/src/lib/util/state/Makefile (+1 lines)
50		50
51	BIN_OR_LIB = LIB	51	BIN_OR_LIB = LIB
52	TARGET_TO_MAKE = libSCstate	52	TARGET_TO_MAKE = libSCstate
		53	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCkeyval.la
53		54
54	default:: $(DEPENDINCLUDE)	55	default:: $(DEPENDINCLUDE)
55		56

Lines 61-66 Link Here

(-)mpqc-2.3.1.orig/src/lib/util/group/Makefile (+1 lines)
61		61
62	BIN_OR_LIB = LIB	62	BIN_OR_LIB = LIB
63	TARGET_TO_MAKE = libSCgroup	63	TARGET_TO_MAKE = libSCgroup
		64	LIBADD = $(SRCDIR)/$(TOPDIR)/lib/libSCkeyval.la
64		65
65	TESTCXXSRC = pooltest.cc messtest.cc rnglocktest.cc thrtest.cc prttest.cc	66	TESTCXXSRC = pooltest.cc messtest.cc rnglocktest.cc thrtest.cc prttest.cc
66	DISTFILES = $(REQUIREDCXXSRC) $(OPTIONALCXXSRC) $(INC) \	67	DISTFILES = $(REQUIREDCXXSRC) $(OPTIONALCXXSRC) $(INC) \

Lines 5-11 Link Here

(-)mpqc-2.3.1.orig/src/lib/util/Makefile (-1 / +1 lines)
5		5
6	include $(SRCDIR)/$(TOPDIR)/lib/GlobalMakefile	6	include $(SRCDIR)/$(TOPDIR)/lib/GlobalMakefile
7		7
8	SUBDIRS = options ref container class state misc keyval group render	8	SUBDIRS = options keyval ref container class state misc group render
9		9
10	include $(SRCDIR)/$(TOPDIR)/lib/GlobalSubDirs	10	include $(SRCDIR)/$(TOPDIR)/lib/GlobalSubDirs
11		11

Lines 75-81 Link Here

(-)mpqc-2.3.1.orig/lib/GlobalRules (-2 / +2 lines)
75	$(RANLIB) $@	75	$(RANLIB) $@
76		76
77	$(TOPDIR)/lib/$(TARGET_TO_MAKE).la: $(LIBOBJ)	77	$(TOPDIR)/lib/$(TARGET_TO_MAKE).la: $(LIBOBJ)
78	$(LTLINK) $(CXX) -o $@ $^ $(wildcard $(TMPLREPO)/*.o) $(LTLINKLIBOPTS)	78	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(wildcard $(TMPLREPO)/*.o) $(LTLINKLIBOPTS) $(LIBADD)
79		79
80	else	80	else
81		81
Lines 104-110 Link Here
104	endif	104	endif
105		105
106	$(TOPDIR)/lib/$(TARGET_TO_MAKE).la: $(LIBOBJ)	106	$(TOPDIR)/lib/$(TARGET_TO_MAKE).la: $(LIBOBJ)
107	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)	107	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS) $(LIBADD)
108		108
109	endif	109	endif
110		110

Lines 9-12 Link Here

(-)mpqc-2.3.1.orig/doc/devsamp/Makefile (-1 / +1 lines)
9	LTLINKBINOPTS := $(shell $(SCCONFIG) --ltlinkbinopts)	9	LTLINKBINOPTS := $(shell $(SCCONFIG) --ltlinkbinopts)
10		10
11	mp2: mp2.o	11	mp2: mp2.o
12	$(LTLINK) $(CXX) $(CXXFLAGS) -o $@ $^ -L$(LIBDIR) -lmpqc $(LIBS) $(LTLINKBINOPTS)	12	$(LTLINK) $(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $^ -L$(LIBDIR) -lmpqc $(LIBS) $(LTLINKBINOPTS)

Lines 82-88 Link Here

(-)mpqc-2.3.1.orig/src/bin/mpqc/Makefile (-1 / +1 lines)
82	$(RANLIB) $@	82	$(RANLIB) $@
83		83
84	$(TOPDIR)/lib/libmpqc.la: $(BINOBJ)	84	$(TOPDIR)/lib/libmpqc.la: $(BINOBJ)
85	$(LTLINK) $(CXX) -o $@ $^ $(LTLINKLIBOPTS)	85	$(LTLINK) $(CXX) $(LDFLAGS) -o $@ $^ $(LTLINKLIBOPTS)
86		86
87	install_devel:: $(TOPDIR)/lib/libmpqc.$(LIBSUF)	87	install_devel:: $(TOPDIR)/lib/libmpqc.$(LIBSUF)
88	$(INSTALL) $(INSTALLDIROPT) $(installroot)$(libdir)	88	$(INSTALL) $(INSTALLDIROPT) $(installroot)$(libdir)

Return to bug 248345