Attachment #146283 for bug #155424

Lines 121-126 Link Here

(-)./Makefile (+1 lines)
121	.PHONY : clean	121	.PHONY : clean
122	clean:	122	clean:
123	-rm .o ngtcltk/.o togl/.o lib/$(MACHINE)/lib.a lib/$(MACHINE)/*.o ng	123	-rm .o ngtcltk/.o togl/.o lib/$(MACHINE)/lib.a lib/$(MACHINE)/*.o ng
		124	-rm ngsolve/evplapack.o ngsolve/fastmat.o
124	#	125	#
125	#	126	#
126	.PHONY : cleanapp	127	.PHONY : cleanapp

Lines 1-4 Link Here

(-)./libsrc/interface/Makefile (-1 / +1 lines)
1	src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp	1	src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp
2	#	2	#
3	lib = nginterface	3	lib = nginterface
4	libpath = libsrc/interface	4	libpath = libsrc/interface




#
ARFLAGS = r
#
LIBA=lib$(lib).so
LIBB=$(LIB_DIR)/lib$(lib).a
#
.PRECIOUS: .cpp .c
.SUFFIXES: .cpp .c .o .lo
#
.cpp.o:
	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
.c.o:
	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
.cpp.lo:
	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) -fPIC -DPIC $< -o $@

all: $(LIBA) $(LIBB)
	
#
#
$(LIBA):: $(LIB_DIR) 
$(LIBB):: $(LIB_DIR) 
#
# make lib from sources:
#
$(LIBA):: $(src:%.cpp=%.lo)
	$(CPLUSPLUS) -shared -o $(LIB_DIR)/$@.4.4 *.lo -Wl,-soname,$@.4.4
	ln -sf $@.4.4 $(LIB_DIR)/$@.4
	ln -sf $@.4.4 $(LIB_DIR)/$@

$(LIBB):: $(src:%.cpp=%.o)
	@$(AR) $(ARFLAGS) $@ *.o
	-@$(RM) *.o
	-@$(RANLIB) $@

Lines 3-9 Link Here

(-)./libsrc/linalg/Makefile (-1 / +1 lines)
3	#	3	#
4	src = basemat.cpp densemat.cpp vector.cpp sparsmat.cpp polynomial.cpp	4	src = basemat.cpp densemat.cpp vector.cpp sparsmat.cpp polynomial.cpp
5	#	5	#
6	lib = la	6	lib = netgen_linalg
7	libpath = libsrc/linalg	7	libpath = libsrc/linalg
8	#	8	#
9	#	9	#

Lines 5-11 Link Here

(-)./libsrc/general/Makefile (-1 / +1 lines)
5	spbita2d.cpp seti.cpp optmem.cpp sort.cpp mystring.cpp parthreads.cpp \	5	spbita2d.cpp seti.cpp optmem.cpp sort.cpp mystring.cpp parthreads.cpp \
6	moveablemem.cpp dynamicmem.cpp ngexception.cpp	6	moveablemem.cpp dynamicmem.cpp ngexception.cpp
7	#	7	#
8	lib = gen	8	lib = netgen_general
9	libpath = libsrc/general	9	libpath = libsrc/general
10	#	10	#
11	include ../makefile.inc	11	include ../makefile.inc

Lines 6-12 Link Here

(-)./libsrc/gprim/Makefile (-1 / +1 lines)
6		6
7	# reftrans.cpp rot3d.cpp	7	# reftrans.cpp rot3d.cpp
8	#	8	#
9	lib = gprim	9	lib = netgen_gprim
10	libpath = libsrc/gprim	10	libpath = libsrc/gprim
11	#	11	#
12	#	12	#

Lines 10-16 Link Here

(-)./libsrc/csg/Makefile (-1 / +1 lines)
10	#	10	#
11	# lex.yy.cpp geometry.cpp	11	# lex.yy.cpp geometry.cpp
12	#	12	#
13	lib = csg	13	lib = netgen_csg
14	libpath = libsrc/csg	14	libpath = libsrc/csg
15	#	15	#
16	#	16	#

Lines 3-9 Link Here

(-)./libsrc/geom2d/Makefile (-1 / +1 lines)
3	#	3	#
4	src = spline2d.cpp geom2dmesh.cpp splinegeometry2.cpp genmesh2d.cpp	4	src = spline2d.cpp geom2dmesh.cpp splinegeometry2.cpp genmesh2d.cpp
5	#	5	#
6	lib = geom2d	6	lib = netgen_geom2d
7	libpath = libsrc/geom2d	7	libpath = libsrc/geom2d
8	#	8	#
9	#	9	#

Lines 3-9 Link Here

(-)./libsrc/stlgeom/Makefile (-1 / +1 lines)
3	#	3	#
4	src = stlgeom.cpp stltopology.cpp stlgeomchart.cpp stlgeommesh.cpp meshstlsurface.cpp stlline.cpp stltool.cpp	4	src = stlgeom.cpp stltopology.cpp stlgeomchart.cpp stlgeommesh.cpp meshstlsurface.cpp stlline.cpp stltool.cpp
5	#	5	#
6	lib = stlgeom	6	lib = netgen_stlgeom
7	libpath = libsrc/stlgeom	7	libpath = libsrc/stlgeom
8	#	8	#
9	#	9	#

Lines 3-9 Link Here

(-)./libsrc/occ/Makefile (-1 / +1 lines)
3	#	3	#
4	src = occgeom.cpp occmeshsurf.cpp occgenmesh.cpp	4	src = occgeom.cpp occmeshsurf.cpp occgenmesh.cpp
5		5
6	lib = occ	6	lib = netgen_occ
7	libpath = libsrc/occ	7	libpath = libsrc/occ
8	#	8	#
9	#	9	#

Lines 9-15 Link Here

(-)./libsrc/meshing/Makefile (-1 / +1 lines)
9	boundarylayer.cpp specials.cpp msghandler.cpp \	9	boundarylayer.cpp specials.cpp msghandler.cpp \
10	pyramidrls.cpp pyramid2rls.cpp prism2rls.cpp curvedelems.cpp curvedelems2.cpp	10	pyramidrls.cpp pyramid2rls.cpp prism2rls.cpp curvedelems.cpp curvedelems2.cpp
11	#	11	#
12	lib = mesh	12	lib = netgen_meshing
13	libpath = libsrc/meshing	13	libpath = libsrc/meshing
14	#	14	#
15	include ../makefile.inc	15	include ../makefile.inc

Lines 3-9 Link Here

(-)./libsrc/opti/Makefile (-1 / +1 lines)
3	#	3	#
4	src = bfgs.cpp linsearch.cpp linopt.cpp	4	src = bfgs.cpp linsearch.cpp linopt.cpp
5	#	5	#
6	lib = opti	6	lib = netgen_opti
7	libpath = libsrc/opti	7	libpath = libsrc/opti
8	#	8	#
9	#	9	#

Lines 3-9 Link Here

(-)./libsrc/visualization/Makefile (-1 / +1 lines)
3	#	3	#
4	src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vsocc.cpp vssolution.cpp meshdoc.cpp	4	src = stlmeshing.cpp mvdraw.cpp vscsg.cpp vsmesh.cpp vsocc.cpp vssolution.cpp meshdoc.cpp
5	#	5	#
6	lib = vis	6	lib = netgen_visualization
7	libpath = libsrc/visualization	7	libpath = libsrc/visualization
8	#	8	#
9	#	9	#

Lines 1-6 Link Here

(-)./libsrc/interface/Makefile (-1 / +1 lines)
1	src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp	1	src = nglib.cpp nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp writegmsh.cpp readuser.cpp importsolution.cpp
2	#	2	#
3	lib = nginterface	3	lib = netgen_interface
4	libpath = libsrc/interface	4	libpath = libsrc/interface
5	#	5	#
6	include ../makefile.inc	6	include ../makefile.inc

Lines 64-71 Link Here

(-)./ngsolve/Makefile (-5 / +20 lines)
64	#	64	#
65	#	65	#
66	#	66	#
67	lib = ../lib/$(MACHINE)/libngsolve.a	67	lib = ../lib/$(MACHINE)/libnetgen_solve.a
68	lib2 = ../lib/$(MACHINE)/libngsolvebasic.a	68	slib = libnetgen_solve.so
		69	lib2 = ../lib/$(MACHINE)/libnetgen_solvebasic.a
		70	slib2 = libnetgen_solvebasic.so
69	libold = ../lib/$(MACHINE)/libngsolve_oldla.a	71	libold = ../lib/$(MACHINE)/libngsolve_oldla.a
70	#	72	#
71	#	73	#
Lines 74-80 Link Here
74	#	76	#
75	#	77	#
76	# .PRECIOUS: .cpp .hh	78	# .PRECIOUS: .cpp .hh
77	# .SUFFIXES: .cpp .o	79	.SUFFIXES: .cpp .o .lo
78	#	80	#
79	# .cpp.o:	81	# .cpp.o:
80	# $(CPLUSPLUS) -c $<	82	# $(CPLUSPLUS) -c $<
Lines 84-105 Link Here
84	#	86	#
85	# make lib from sources:	87	# make lib from sources:
86	#	88	#
87	goal: $(lib) $(lib2)	89	goal: $(lib) $(lib2) ../lib/$(MACHINE)/$(slib) ../lib/$(MACHINE)/$(slib2)
88	#	90	#
89	pebblesinc = -I../../pebbles_old/libsrc/setup -I../../pebbles_old/libsrc/solver -I../../pebbles_old/libsrc/prepro -I../../pebbles_old/libsrc/parallel -I../../pebbles_old/libsrc	91	pebblesinc = -I../../pebbles_old/libsrc/setup -I../../pebbles_old/libsrc/solver -I../../pebbles_old/libsrc/prepro -I../../pebbles_old/libsrc/parallel -I../../pebbles_old/libsrc
90	#	92	#
		93	.cpp.lo:
		94	$(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS -fPIC -DPIC $< -o $@
		95
91	$(lib):: $(src)	96	$(lib):: $(src)
92	$(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $?	97	$(CPLUSPLUS) -c -I. -I../libsrc -I../libsrc/include -I../libsrc/interface -Iinclude $(pebblesinc) $(CPLUSPLUSFLAGS2) -DNETGEN_ELTRANS $?
93	$(AR) $(ARFLAGS) $@ *.o	98	$(AR) $(ARFLAGS) $@ *.o
94	mv *.o ../lib/$(MACHINE)	99	mv *.o ../lib/$(MACHINE)
95	-$(RM) *.o	100	-$(RM) *.o
96	-@$(RANLIB) $@	101	-@$(RANLIB) $@
97	#	102
		103	../lib/$(MACHINE)/$(slib):: $(src:%.cpp=%.lo)
		104	$(CPLUSPLUS) -shared -o ../lib/$(MACHINE)/$(slib).4.4 $^ -Wl,-soname,$(slib).4.4
		105	ln -sf $(slib).4.4 $@.4
		106	ln -sf $(slib).4.4 $@
		107
98	$(lib2):: $(src2)	108	$(lib2):: $(src2)
99	$(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $?	109	$(CPLUSPLUS) -c -I. -I../libsrc/interface -Iinclude $(CPLUSPLUSFLAGS2) $?
100	$(AR) $(ARFLAGS) $@ *.o	110	$(AR) $(ARFLAGS) $@ *.o
101	-$(RM) *.o	111	-$(RM) *.o
102	-@$(RANLIB) $@	112	-@$(RANLIB) $@
		113
		114	../lib/$(MACHINE)/$(slib2):: $(src2:%.cpp=%.lo)
		115	$(CPLUSPLUS) -shared -o ../lib/$(MACHINE)/$(slib2).4.4 $^ -Wl,-soname,$(slib2).4.4
		116	ln -sf $(slib2).4.4 $@.4
		117	ln -sf $(slib2).4.4 $@
103	#	118	#
104	#	119	#
105	#	120	#

Lines 14-21 Link Here

(-)./Makefile (-2 / +2 lines)
14	#	14	#
15	#	15	#
16	#	16	#
17	mylib = -lnginterface -lvis -lcsg -lstlgeom -lgeom2d -lmesh -lgprim -lopti \	17	mylib = -lnetgen_interface -lnetgen_visualization -lnetgen_csg -lnetgen_stlgeom -lnetgen_geom2d -lnetgen_meshing -lnetgen_gprim -lnetgen_opti \
18	-lla -lgen -locc	18	-lnetgen_linalg -lnetgen_general -lnetgen_occ
19	#	19	#
20	#	20	#
21	# system libraries:	21	# system libraries:

Lines 36-39 Link Here

(-)./libsrc/makefile.mach.LINUX (-1 / +1 lines)
36	# lapack = -llapack -lblas -lgmp -lg2c	36	# lapack = -llapack -lblas -lgmp -lg2c
37		37
38		38
39	appngs = lib/$(MACHINE)/*.o -lngsolvebasic	39	appngs = lib/$(MACHINE)/*.o -lnetgen_solvebasic

Return to bug 155424

Lines 18-40 Link Here

(-)./libsrc/makefile.inc (-3 / +14 lines)
18	#	18	#
19	ARFLAGS = r	19	ARFLAGS = r
20	#	20	#
		21	LIBA=lib$(lib).so
21	LIBB=$(LIB_DIR)/lib$(lib).a	22	LIBB=$(LIB_DIR)/lib$(lib).a
22	#	23	#
23	.PRECIOUS: .cpp .c	24	.PRECIOUS: .cpp .c
24	.SUFFIXES: .cpp .c .o	25	.SUFFIXES: .cpp .c .o .lo
25	#	26	#
26	.cpp.o:	27	.cpp.o:
27	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<	28	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
28	.c.o:	29	.c.o:
29	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<	30	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $<
		31	.cpp.lo:
		32	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) -fPIC -DPIC $< -o $@
		33
		34	all: $(LIBA) $(LIBB)
		35
30	#	36	#
31	#	37	#
		38	$(LIBA):: $(LIB_DIR)
32	$(LIBB):: $(LIB_DIR)	39	$(LIBB):: $(LIB_DIR)
33	#	40	#
34	# make lib from sources:	41	# make lib from sources:
35	#	42	#
36	$(LIBB):: $(src)	43	$(LIBA):: $(src:%.cpp=%.lo)
37	$(CPLUSPLUS) $(CPLUSPLUSFLAGS1) $(CPLUSPLUSFLAGS2) $(CPLUSPLUSFLAGSLIBRARY) $?	44	$(CPLUSPLUS) -shared -o $(LIB_DIR)/$@.4.4 *.lo -Wl,-soname,$@.4.4
		45	ln -sf $@.4.4 $(LIB_DIR)/$@.4
		46	ln -sf $@.4.4 $(LIB_DIR)/$@
		47
		48	$(LIBB):: $(src:%.cpp=%.o)
38	@$(AR) $(ARFLAGS) $@ *.o	49	@$(AR) $(ARFLAGS) $@ *.o
39	-@$(RM) *.o	50	-@$(RM) *.o
40	-@$(RANLIB) $@	51	-@$(RANLIB) $@