Attachment #101738 for bug #136489

View | Details | Raw Unified | Return to bug 136489
Collapse All | Expand All




            FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
            GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
            IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
            DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
	    if test "x$libdir" != "x/usr/lib"; then
		    DSOLINK="-Wl,-rpath,$libdir"
            fi

	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
	fi

	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS"
	CFLAGS="$CFLAGS $X_CFLAGS"
	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
	LDFLAGS="$X_LIBS $LDFLAGS"

	if test "x$x_includes" != x; then
	    ac_cpp="$ac_cpp -I$x_includes"

Lines 74-81 Link Here

(-)fltk-1.1.7/makeinclude.in.old (-2 / +3 lines)
74		74
75	# libraries to link with:	75	# libraries to link with:
76	AUDIOLIBS = @AUDIOLIBS@	76	AUDIOLIBS = @AUDIOLIBS@
77	LDLIBS = @LDFLAGS@ @LIBS@	77	LDFLAGS = @LDFLAGS@
78	GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@	78	LDLIBS = @LIBS@
		79	GLDLIBS = @GLLIB@ @LIBS@
79	LINKFLTK = @LINKFLTK@	80	LINKFLTK = @LINKFLTK@
80	LINKFLTKGL = @LINKFLTKGL@	81	LINKFLTKGL = @LINKFLTKGL@
81	LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@	82	LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@





libfltk.so.1.1: $(OBJECTS)
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
	$(RM) libfltk.so
	$(LN) libfltk.so.1.1 libfltk.so

libfltk.sl.1.1: $(OBJECTS)
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
	$(RM) libfltk.sl
	$(LN) libfltk.sl.1.1 libfltk.sl



libfltk_s.a: $(OBJECTS)
	echo $(DSOCOMMAND) libfltk_s.o ...
	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
	$(RM) $@
	$(LIBCOMMAND) libfltk_s.a libfltk_s.o


libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
	$(RM) libfltk_forms.so
	$(LN) libfltk_forms.so.1.1 libfltk_forms.so

libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
	$(RM) libfltk_forms.sl
	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl



libfltk_forms_s.a: $(FLOBJECTS)
	echo $(DSOCOMMAND) libfltk_forms_s.o ...
	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
	$(RM) $@
	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o


libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
	$(RM) libfltk_gl.so
	$(LN) libfltk_gl.so.1.1 libfltk_gl.so

libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
	$(RM) libfltk_gl.sl
	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl



libfltk_gl_s.a: $(GLOBJECTS)
	echo $(DSOCOMMAND) libfltk_gl_s.o ...
	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
	$(RM) $@
	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o


libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
	$(RM) libfltk_images.so
	$(LN) libfltk_images.so.1.1 libfltk_images.so

libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
	echo $(DSOCOMMAND) $@ ...
	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
	$(RM) libfltk_images.sl
	$(LN) libfltk_images.sl.1.1 libfltk_images.sl



libfltk_images_s.a: $(IMGOBJECTS)
	echo $(DSOCOMMAND) libfltk_images_s.o ...
	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
	$(RM) $@
	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o

Return to bug 136489

Lines 171-177 Link Here

(-)fltk-1.1.7/configure.in.old (-3 / +2 lines)
171	FLDSONAME="libfltk_forms.so.$FL_API_VERSION"	171	FLDSONAME="libfltk_forms.so.$FL_API_VERSION"
172	GLDSONAME="libfltk_gl.so.$FL_API_VERSION"	172	GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
173	IMGDSONAME="libfltk_images.so.$FL_API_VERSION"	173	IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
174	DSOCOMMAND="\$(CXX) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"	174	DSOCOMMAND="\$(CXX) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
175	if test "x$libdir" != "x/usr/lib"; then	175	if test "x$libdir" != "x/usr/lib"; then
176	DSOLINK="-Wl,-rpath,$libdir"	176	DSOLINK="-Wl,-rpath,$libdir"
177	fi	177	fi
Lines 647-656 Link Here
647	AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)	647	AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
648	fi	648	fi
649		649
650	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"	650	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS"
651	CFLAGS="$CFLAGS $X_CFLAGS"	651	CFLAGS="$CFLAGS $X_CFLAGS"
652	CXXFLAGS="$CXXFLAGS $X_CFLAGS"	652	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
653	LDFLAGS="$X_LIBS $LDFLAGS"
654		653
655	if test "x$x_includes" != x; then	654	if test "x$x_includes" != x; then
656	ac_cpp="$ac_cpp -I$x_includes"	655	ac_cpp="$ac_cpp -I$x_includes"

Lines 202-214 Link Here

(-)fltk-1.1.7/src/Makefile.old (-12 / +12 lines)
202		202
203	libfltk.so.1.1: $(OBJECTS)	203	libfltk.so.1.1: $(OBJECTS)
204	echo $(DSOCOMMAND) $@ ...	204	echo $(DSOCOMMAND) $@ ...
205	$(DSOCOMMAND) $@ $(OBJECTS)	205	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
206	$(RM) libfltk.so	206	$(RM) libfltk.so
207	$(LN) libfltk.so.1.1 libfltk.so	207	$(LN) libfltk.so.1.1 libfltk.so
208		208
209	libfltk.sl.1.1: $(OBJECTS)	209	libfltk.sl.1.1: $(OBJECTS)
210	echo $(DSOCOMMAND) $@ ...	210	echo $(DSOCOMMAND) $@ ...
211	$(DSOCOMMAND) $@ $(OBJECTS)	211	$(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
212	$(RM) libfltk.sl	212	$(RM) libfltk.sl
213	$(LN) libfltk.sl.1.1 libfltk.sl	213	$(LN) libfltk.sl.1.1 libfltk.sl
214		214
Lines 224-230 Link Here
224		224
225	libfltk_s.a: $(OBJECTS)	225	libfltk_s.a: $(OBJECTS)
226	echo $(DSOCOMMAND) libfltk_s.o ...	226	echo $(DSOCOMMAND) libfltk_s.o ...
227	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)	227	$(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
228	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o	228	echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
229	$(RM) $@	229	$(RM) $@
230	$(LIBCOMMAND) libfltk_s.a libfltk_s.o	230	$(LIBCOMMAND) libfltk_s.a libfltk_s.o
Lines 238-250 Link Here
238		238
239	libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1	239	libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
240	echo $(DSOCOMMAND) $@ ...	240	echo $(DSOCOMMAND) $@ ...
241	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk	241	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
242	$(RM) libfltk_forms.so	242	$(RM) libfltk_forms.so
243	$(LN) libfltk_forms.so.1.1 libfltk_forms.so	243	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
244		244
245	libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1	245	libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
246	echo $(DSOCOMMAND) $@ ...	246	echo $(DSOCOMMAND) $@ ...
247	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk	247	$(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
248	$(RM) libfltk_forms.sl	248	$(RM) libfltk_forms.sl
249	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl	249	$(LN) libfltk_forms.sl.1.1 libfltk_forms.sl
250		250
Lines 260-266 Link Here
260		260
261	libfltk_forms_s.a: $(FLOBJECTS)	261	libfltk_forms_s.a: $(FLOBJECTS)
262	echo $(DSOCOMMAND) libfltk_forms_s.o ...	262	echo $(DSOCOMMAND) libfltk_forms_s.o ...
263	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)	263	$(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
264	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o	264	echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
265	$(RM) $@	265	$(RM) $@
266	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o	266	$(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
Lines 274-286 Link Here
274		274
275	libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1	275	libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
276	echo $(DSOCOMMAND) $@ ...	276	echo $(DSOCOMMAND) $@ ...
277	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk	277	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
278	$(RM) libfltk_gl.so	278	$(RM) libfltk_gl.so
279	$(LN) libfltk_gl.so.1.1 libfltk_gl.so	279	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
280		280
281	libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1	281	libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
282	echo $(DSOCOMMAND) $@ ...	282	echo $(DSOCOMMAND) $@ ...
283	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk	283	$(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
284	$(RM) libfltk_gl.sl	284	$(RM) libfltk_gl.sl
285	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl	285	$(LN) libfltk_gl.sl.1.1 libfltk_gl.sl
286		286
Lines 296-302 Link Here
296		296
297	libfltk_gl_s.a: $(GLOBJECTS)	297	libfltk_gl_s.a: $(GLOBJECTS)
298	echo $(DSOCOMMAND) libfltk_gl_s.o ...	298	echo $(DSOCOMMAND) libfltk_gl_s.o ...
299	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)	299	$(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS)
300	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o	300	echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
301	$(RM) $@	301	$(RM) $@
302	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o	302	$(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
Lines 310-322 Link Here
310		310
311	libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1	311	libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
312	echo $(DSOCOMMAND) $@ ...	312	echo $(DSOCOMMAND) $@ ...
313	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk	313	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
314	$(RM) libfltk_images.so	314	$(RM) libfltk_images.so
315	$(LN) libfltk_images.so.1.1 libfltk_images.so	315	$(LN) libfltk_images.so.1.1 libfltk_images.so
316		316
317	libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1	317	libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
318	echo $(DSOCOMMAND) $@ ...	318	echo $(DSOCOMMAND) $@ ...
319	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk	319	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
320	$(RM) libfltk_images.sl	320	$(RM) libfltk_images.sl
321	$(LN) libfltk_images.sl.1.1 libfltk_images.sl	321	$(LN) libfltk_images.sl.1.1 libfltk_images.sl
322		322
Lines 332-338 Link Here
332		332
333	libfltk_images_s.a: $(IMGOBJECTS)	333	libfltk_images_s.a: $(IMGOBJECTS)
334	echo $(DSOCOMMAND) libfltk_images_s.o ...	334	echo $(DSOCOMMAND) libfltk_images_s.o ...
335	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)	335	$(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
336	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o	336	echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
337	$(RM) $@	337	$(RM) $@
338	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o	338	$(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o