Attachment #243333 for bug #333161

Lines 36-42 Link Here

(-)../plib-1.8.5/configure.in (-1 / +1 lines)
36	AC_PROG_CXX	36	AC_PROG_CXX
37	AC_PROG_CXXCPP	37	AC_PROG_CXXCPP
38	AC_PROG_INSTALL	38	AC_PROG_INSTALL
39	AC_PROG_RANLIB	39	AC_PROG_LIBTOOL
40		40
41	dnl Command line arguments	41	dnl Command line arguments
42		42

Lines 1-10 Link Here

(-)../plib-1.8.5/src/fnt/Makefile.am (-2 / +5 lines)
1	if BUILD_FNT	1	if BUILD_FNT
2		2
3	lib_LIBRARIES = libplibfnt.a	3	lib_LTLIBRARIES = libplibfnt.la
4		4
5	include_HEADERS = fnt.h	5	include_HEADERS = fnt.h
6		6
7	libplibfnt_a_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx	7	libplibfnt_la_LDFLAGS = -version-info 9:5:8
		8	libplibfnt_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		9
		10	libplibfnt_la_SOURCES = fnt.cxx fntTXF.cxx fntLocal.h fntBitmap.cxx
8		11
9	INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util	12	INCLUDES = -I$(top_srcdir)/src/sg -I$(top_srcdir)/src/util
10		13

Lines 1-10 Link Here

(-)../plib-1.8.5/src/js/Makefile.am (-2 / +5 lines)
1	if BUILD_JS	1	if BUILD_JS
2		2
3	lib_LIBRARIES = libplibjs.a	3	lib_LTLIBRARIES = libplibjs.la
4		4
5	include_HEADERS = js.h	5	include_HEADERS = js.h
6		6
7	libplibjs_a_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \	7	libplibjs_la_LDFLAGS = -version-info 9:5:8
		8	libplibjs_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		9
		10	libplibjs_la_SOURCES = js.cxx jsLinux.cxx jsLinuxOld.cxx jsMacOS.cxx \
8	jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \	11	jsMacOSX.cxx jsWindows.cxx jsBSD.cxx \
9	jsNone.cxx	12	jsNone.cxx
10		13

Line 1 Link Here

(-)../plib-1.8.5/src/Makefile.am (-1 / +1 lines)
1	SUBDIRS = util js sl pui puAux sg ssg fnt ssgAux net psl pw	1	SUBDIRS = util js sl fnt pui sg ssg puAux ssgAux net psl pw

Lines 1-11 Link Here

(-)../plib-1.8.5/src/net/Makefile.am (-2 / +5 lines)
1	if BUILD_NET	1	if BUILD_NET
2		2
3	lib_LIBRARIES = libplibnet.a	3	lib_LTLIBRARIES = libplibnet.la
4		4
5	include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \	5	include_HEADERS = netBuffer.h netChannel.h netChat.h netMessage.h \
6	netMonitor.h netSocket.h net.h	6	netMonitor.h netSocket.h net.h
7		7
8	libplibnet_a_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \	8	libplibnet_la_LDFLAGS = -version-info 9:5:8
		9	libplibnet_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		10
		11	libplibnet_la_SOURCES = netBuffer.cxx netChannel.cxx netChat.cxx \
9	netMessage.cxx netMonitor.cxx netSocket.cxx	12	netMessage.cxx netMonitor.cxx netSocket.cxx
10		13
11	INCLUDES = -I$(top_srcdir)/src/util	14	INCLUDES = -I$(top_srcdir)/src/util

Lines 1-11 Link Here

(-)../plib-1.8.5/src/psl/Makefile.am (-2 / +5 lines)
1		1
2	if BUILD_PSL	2	if BUILD_PSL
3		3
4	lib_LIBRARIES = libplibpsl.a	4	lib_LTLIBRARIES = libplibpsl.la
5		5
6	include_HEADERS = psl.h	6	include_HEADERS = psl.h
7		7
8	libplibpsl_a_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \	8	libplibpsl_la_LDFLAGS = -version-info 9:5:8
		9	libplibpsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		10
		11	libplibpsl_la_SOURCES = psl.cxx pslCodeGen.cxx pslContext.cxx \
9	pslCompiler.cxx pslSymbols.cxx pslToken.cxx \	12	pslCompiler.cxx pslSymbols.cxx pslToken.cxx \
10	pslExpression.cxx pslProgram.cxx pslDump.cxx \	13	pslExpression.cxx pslProgram.cxx pslDump.cxx \
11	pslError.cxx pslFileIO.cxx pslCompiler.h \	14	pslError.cxx pslFileIO.cxx pslCompiler.h \

Lines 1-10 Link Here

(-)../plib-1.8.5/src/puAux/Makefile.am (-2 / +5 lines)
1	if BUILD_PUAUX	1	if BUILD_PUAUX
2		2
3	lib_LIBRARIES = libplibpuaux.a	3	lib_LTLIBRARIES = libplibpuaux.la
4		4
5	include_HEADERS = puAux.h puAuxLocal.h	5	include_HEADERS = puAux.h puAuxLocal.h
6		6
7	libplibpuaux_a_SOURCES = puAux.cxx \	7	libplibpuaux_la_LDFLAGS = -version-info 9:5:8
		8	libplibpuaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la $(top_builddir)/src/pui/libplibpu.la $(top_builddir)/src/sg/libplibsg.la
		9
		10	libplibpuaux_la_SOURCES = puAux.cxx \
8	puAuxBiSlider.cxx \	11	puAuxBiSlider.cxx \
9	puAuxBiSliderWithEnds.cxx \	12	puAuxBiSliderWithEnds.cxx \
10	puAuxComboBox.cxx \	13	puAuxComboBox.cxx \

Lines 1-10 Link Here

(-)../plib-1.8.5/src/pui/Makefile.am (-2 / +5 lines)
1	if BUILD_PUI	1	if BUILD_PUI
2		2
3	lib_LIBRARIES = libplibpu.a	3	lib_LTLIBRARIES = libplibpu.la
4		4
5	include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h	5	include_HEADERS = pu.h puGLUT.h puFLTK.h puSDL.h puNative.h puPW.h
6		6
7	libplibpu_a_SOURCES = \	7	libplibpu_la_LDFLAGS = -version-info 9:5:8
		8	libplibpu_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/fnt/libplibfnt.la
		9
		10	libplibpu_la_SOURCES = \
8	pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \	11	pu.cxx puBox.cxx puButton.cxx puButtonBox.cxx \
9	puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \	12	puArrowButton.cxx puDialogBox.cxx puFrame.cxx puGroup.cxx \
10	puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \	13	puInput.cxx puInterface.cxx puLocal.h puMenuBar.cxx \

Lines 1-10 Link Here

(-)../plib-1.8.5/src/pw/Makefile.am (-2 / +3 lines)
1	if BUILD_PW	1	if BUILD_PW
2		2
3	lib_LIBRARIES = libplibpw.a	3	lib_LTLIBRARIES = libplibpw.la
4		4
5	include_HEADERS = pw.h	5	include_HEADERS = pw.h
6		6
7	libplibpw_a_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx	7	libplibpw_la_LDFLAGS = -version-info 9:5:8
		8	libplibpw_la_SOURCES = pw.cxx pwX11.cxx pwWindows.cxx pwMacOSX.cxx
8		9
9	INCLUDES = -I$(top_srcdir)/src/util	10	INCLUDES = -I$(top_srcdir)/src/util
10		11

Lines 1-10 Link Here

(-)../plib-1.8.5/src/sg/Makefile.am (-2 / +5 lines)
1	if BUILD_SG	1	if BUILD_SG
2		2
3	lib_LIBRARIES = libplibsg.a	3	lib_LTLIBRARIES = libplibsg.la
4		4
5	include_HEADERS = sg.h	5	include_HEADERS = sg.h
6		6
7	libplibsg_a_SOURCES = sg.cxx sgd.cxx \	7	libplibsg_la_LDFLAGS = -version-info 9:5:8
		8	libplibsg_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		9
		10	libplibsg_la_SOURCES = sg.cxx sgd.cxx \
8	sgIsect.cxx sgdIsect.cxx \	11	sgIsect.cxx sgdIsect.cxx \
9	sgPerlinNoise.cxx	12	sgPerlinNoise.cxx
10		13




if BUILD_SL

lib_LTLIBRARIES = libplibsl.la libplibsm.la

include_HEADERS = sl.h slPortability.h sm.h

libplibsl_la_LDFLAGS = -version-info 9:5:8
libplibsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la

libplibsl_la_SOURCES = \
	slDSP.cxx slSample.cxx slEnvelope.cxx \
	slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
        slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
        slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h

libplibsm_la_LDFLAGS = -version-info 9:5:8
libplibsm_la_SOURCES = slPortability.h smMixer.cxx

INCLUDES = -I$(top_srcdir)/src/util


Lines 1-10 Link Here

(-)../plib-1.8.5/src/ssg/Makefile.am (-2 / +5 lines)
1	if BUILD_SSG	1	if BUILD_SSG
2		2
3	lib_LIBRARIES = libplibssg.a	3	lib_LTLIBRARIES = libplibssg.la
4		4
5	include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h	5	include_HEADERS = ssg.h ssgconf.h ssgMSFSPalette.h ssgKeyFlier.h pcx.h
6		6
7	libplibssg_a_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \	7	libplibssg_la_LDFLAGS = -version-info 9:5:8
		8	libplibssg_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/sg/libplibsg.la
		9
		10	libplibssg_la_SOURCES = ssg.cxx ssgAnimation.cxx ssgBase.cxx \
8	ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \	11	ssgBaseTransform.cxx ssgBranch.cxx ssgContext.cxx ssgCutout.cxx \
9	ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \	12	ssgDList.cxx ssgEntity.cxx ssgIsect.cxx ssgLeaf.cxx ssgList.cxx \
10	ssgLoadDOF.cxx ssgLoadAC.cxx \	13	ssgLoadDOF.cxx ssgLoadAC.cxx \

Lines 1-6 Link Here

(-)../plib-1.8.5/src/ssgAux/Makefile.am (-2 / +5 lines)
1	if BUILD_SSGAUX	1	if BUILD_SSGAUX
2		2
3	lib_LIBRARIES = libplibssgaux.a	3	lib_LTLIBRARIES = libplibssgaux.la
4		4
5	include_HEADERS = ssgAux.h \	5	include_HEADERS = ssgAux.h \
6	ssgaShapes.h \	6	ssgaShapes.h \
Lines 13-19 Link Here
13	ssgaFire.h \	13	ssgaFire.h \
14	ssgaBillboards.h	14	ssgaBillboards.h
15		15
16	libplibssgaux_a_SOURCES = ssgAux.cxx \	16	libplibssgaux_la_LDFLAGS = -version-info 9:5:8
		17	libplibssgaux_la_LIBADD = $(top_builddir)/src/util/libplibul.la $(top_builddir)/src/ssg/libplibssg.la $(top_builddir)/src/sg/libplibsg.la
		18
		19	libplibssgaux_la_SOURCES = ssgAux.cxx \
17	ssgaShapes.cxx \	20	ssgaShapes.cxx \
18	ssgaPatch.cxx \	21	ssgaPatch.cxx \
19	ssgaParticleSystem.cxx \	22	ssgaParticleSystem.cxx \

Lines 1-10 Link Here

(-)../plib-1.8.5/src/util/Makefile.am (-2 / +3 lines)
1	if BUILD_UL	1	if BUILD_UL
2		2
3	lib_LIBRARIES = libplibul.a	3	lib_LTLIBRARIES = libplibul.la
4		4
5	include_HEADERS = ul.h ulRTTI.h	5	include_HEADERS = ul.h ulRTTI.h
6		6
7	libplibul_a_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \	7	libplibul_la_LDFLAGS = -version-info 9:5:8
		8	libplibul_la_SOURCES = ul.cxx ulClock.cxx ulError.cxx ulLinkedList.cxx \
8	ulList.cxx ulLocal.h ulRTTI.cxx	9	ulList.cxx ulLocal.h ulRTTI.cxx
9		10
10	endif	11	endif

Return to bug 333161

Lines 1-16 Link Here

(-)../plib-1.8.5/src/sl/Makefile.am (-3 / +7 lines)
1	if BUILD_SL	1	if BUILD_SL
2		2
3	lib_LIBRARIES = libplibsl.a libplibsm.a	3	lib_LTLIBRARIES = libplibsl.la libplibsm.la
4		4
5	include_HEADERS = sl.h slPortability.h sm.h	5	include_HEADERS = sl.h slPortability.h sm.h
6		6
7	libplibsl_a_SOURCES = \	7	libplibsl_la_LDFLAGS = -version-info 9:5:8
		8	libplibsl_la_LIBADD = $(top_builddir)/src/util/libplibul.la
		9
		10	libplibsl_la_SOURCES = \
8	slDSP.cxx slSample.cxx slEnvelope.cxx \	11	slDSP.cxx slSample.cxx slEnvelope.cxx \
9	slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \	12	slPlayer.cxx slMODPlayer.cxx slSamplePlayer.cxx \
10	slScheduler.cxx slMODdacio.cxx slMODfile.cxx \	13	slScheduler.cxx slMODdacio.cxx slMODfile.cxx \
11	slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h	14	slMODinst.cxx slMODnote.cxx slMODPrivate.h slMODfile.h
12		15
13	libplibsm_a_SOURCES = slPortability.h smMixer.cxx	16	libplibsm_la_LDFLAGS = -version-info 9:5:8
		17	libplibsm_la_SOURCES = slPortability.h smMixer.cxx
14		18
15	INCLUDES = -I$(top_srcdir)/src/util	19	INCLUDES = -I$(top_srcdir)/src/util
16		20