Index: configure.in =================================================================== --- configure.in (revision 946) +++ configure.in (working copy) @@ -285,7 +285,7 @@ dnl --------------------------------------------------- dnl Write the output dnl -AC_OUTPUT(Makefile doc/Makefile src/Makefile src/common/Makefile src/file/Makefile src/framebuffer/Makefile src/openexr/Makefile src/gui/Makefile src/precomp/Makefile src/rgbe/Makefile src/sdr/Makefile src/sdrc/Makefile src/ri/Makefile src/rndr/Makefile src/texmake/Makefile src/sdrinfo/Makefile src/show/Makefile) +AC_OUTPUT(Makefile doc/Makefile man/Makefile shaders/Makefile src/Makefile src/common/Makefile src/dsotest/Makefile src/file/Makefile src/framebuffer/Makefile src/openexr/Makefile src/gui/Makefile src/precomp/Makefile src/rgbe/Makefile src/sdr/Makefile src/sdrc/Makefile src/ri/Makefile src/rndr/Makefile src/texmake/Makefile src/sdrinfo/Makefile src/show/Makefile) if test "x$have_x11" != "xtrue"; then echo "------------------------------------------------" Index: src/rgbe/Makefile.am =================================================================== --- src/rgbe/Makefile.am (revision 946) +++ src/rgbe/Makefile.am (working copy) @@ -6,3 +6,5 @@ INCLUDES = -I.. + +noinst_HEADERS = rgbe.h Index: src/show/Makefile.am =================================================================== --- src/show/Makefile.am (revision 946) +++ src/show/Makefile.am (working copy) @@ -2,8 +2,6 @@ bin_PROGRAMS = show endif -EXTRA_DIST = *.h show.dsp - show_SOURCES = show.cpp show_LDADD = ../common/libpixiecommon.la ../ri/libri.la Index: src/framebuffer/Makefile.am =================================================================== --- src/framebuffer/Makefile.am (revision 946) +++ src/framebuffer/Makefile.am (working copy) @@ -9,3 +9,6 @@ INCLUDES = -I.. +noinst_HEADERS = fbx.h framebuffer.h + +EXTRA_DIST = fbw.h fbw.cpp Index: src/gui/Makefile.am =================================================================== --- src/gui/Makefile.am (revision 946) +++ src/gui/Makefile.am (working copy) @@ -17,3 +17,6 @@ INCLUDES = -I.. +noinst_HEADERS = interface.h opengl-fltk.h opengl-qt.h opengl.h statView.h + +EXTRA_DIST = opengl.pro statView.cpp Index: src/dsotest/Makefile.am =================================================================== --- src/dsotest/Makefile.am (revision 0) +++ src/dsotest/Makefile.am (revision 0) @@ -0,0 +1 @@ +EXTRA_DIST = dsotest.cpp Index: src/common/Makefile.am =================================================================== --- src/common/Makefile.am (revision 946) +++ src/common/Makefile.am (working copy) @@ -8,3 +8,6 @@ libpixiecommon_la_SOURCES = algebra.cpp os.cpp +EXTRA_DIST = mathSpec.cpp + +noinst_HEADERS = algebra.h align.h comments.h containers.h global.h mathSpec.h os.h polynomial.h simd.h Index: src/sdr/Makefile.am =================================================================== --- src/sdr/Makefile.am (revision 946) +++ src/sdr/Makefile.am (working copy) @@ -16,6 +16,8 @@ include_HEADERS = sdr.h +EXTRA_DIST = sdr.l sdr.y lex.sdr.cpp + BUILT_SOURCES = ## Additional rules for autogenerating flex products @@ -39,4 +41,4 @@ @BISON@ -p sdr -o sdr.cpp sdr.y endif -## Additional rules for autogenerating bison products \ No newline at end of file +## Additional rules for autogenerating bison products Index: src/sdrc/Makefile.am =================================================================== --- src/sdrc/Makefile.am (revision 946) +++ src/sdrc/Makefile.am (working copy) @@ -6,6 +6,10 @@ # ri is only included for ri_config.h, which seems to be included by dso,y INCLUDES = -I.. -I../ri +noinst_HEADERS = expression.h opcodes.h pp.h ppext.h sdr.h + +EXTRA_DIST = sl.l sl.y lex.sl.cpp lex.dso.cpp + BUILT_SOURCES = ## Additional rules for autogenerating flex products Index: src/precomp/Makefile.am =================================================================== --- src/precomp/Makefile.am (revision 946) +++ src/precomp/Makefile.am (working copy) @@ -6,3 +6,4 @@ INCLUDES = -I.. +EXTRA_DIST = *.dat Index: src/Makefile.am =================================================================== --- src/Makefile.am (revision 946) +++ src/Makefile.am (working copy) @@ -1,4 +1,2 @@ -SUBDIRS = common file framebuffer openexr precomp gui rgbe sdr sdrc ri rndr texmake sdrinfo show +SUBDIRS = common dsotest file framebuffer openexr precomp gui rgbe sdr sdrc ri rndr texmake sdrinfo show -EXTRA_DIST = dsotest - Index: src/ri/Makefile.am =================================================================== --- src/ri/Makefile.am (revision 946) +++ src/ri/Makefile.am (working copy) @@ -84,7 +84,9 @@ includedir = $(prefix)/include include_HEADERS = ri.h dsply.h shadeop.h implicit.h dlo.h ptcapi.h +noinst_HEADERS = attributes.h brickmap.h bsplinePatchgrid.h bundles.h curves.h debug.h delayed.h depository.h displayChannel.h dlobject.h dso.h error.h fileResource.h giFunctions.h giOpcodes.h harmonics.h hcshader.h implicitSurface.h irradiance.h linsys.h map.h memory.h netFileMapping.h noise.h noiseTables.h object.h objectMisc.h occlusion.h options.h patchUtils.h patches.h patchgrid.h photon.h photonMap.h pl.h pointCloud.h pointHierarchy.h points.h polygons.h quadrics.h radiance.h random.h ray.h raytracer.h refCounter.h remoteChannel.h renderer.h rendererContext.h rendererc.h resource.h reyes.h riInterface.h ri_config.h rib.h ribOut.h scriptFunctions.h scriptOpcodes.h shader.h shaderFunctions.h shaderOpcodes.h shaderParameterList.h shading.h show.h slcode.h stats.h stochastic.h stochasticPoint.h stochasticPrimitives.h stochasticQuad.h subdivision.h subdivisionCreator.h subdivisionData.h surface.h texmake.h texture.h texture3d.h tiff.h userAttributes.h variable.h xform.h zbuffer.h zbufferPoint.h zbufferQuad.h +EXTRA_DIST = dso.l dso.y ifexpr.l ifexpr.y rib.l rib.y sdr.l sdr.y variable.l variable.y depository.cpp lex.dso.cpp lex.if.cpp lex.rib.cpp lex.sl.cpp lex.var.cpp radiance.cpp BUILT_SOURCES = Index: shaders/Makefile.am =================================================================== --- shaders/Makefile.am (revision 0) +++ shaders/Makefile.am (revision 0) @@ -0,0 +1,10 @@ +SL_FILES = ambientindirect.sl ambientlight.sl ambientocclusion.sl arealight.sl constant.sl distantlight.sl fog.sl glass.sl matte.sl metal.sl mirror.sl mtorDirectionalLight.sl mtorLambert.sl mtorPhong.sl normdir.sl paintedmatte.sl paintedplastic.sl plastic.sl pointlight.sl rayarea.sl raydistant.sl raypoint.sl shadowarea.sl shadowdistant.sl shadowpoint.sl shadowspot.sl spotlight.sl + +EXTRA_DIST = $(SL_FILES) + +shader_DATA = $(SL_FILES) $(SL_FILES:%.sl=%.sdr) + +SDRC = ../src/sdrc/sdrc + +%.sdr: %.sl $(SDRC) + $(SDRC) $< Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 946) +++ doc/Makefile.am (working copy) @@ -1,14 +1,118 @@ +nobase_doc_DATA = \ +./Category_Documentation.html \ +./Category_Tutorials.html \ +./css/audio.png \ +./css/broswerforms_compact.css \ +./css/browserdefaults_compact.css \ +./css/bullet.gif \ +./css/commonPrint.css \ +./css/discussionitem_icon.gif \ +./css/document.png \ +./css/external.png \ +./css/file_icon.gif \ +./css/handheld.css \ +./css/headbg.jpg \ +./css/IE50Fixes.css \ +./css/IE55Fixes.css \ +./css/IE60Fixes.css \ +./css/IE70Fixes.css \ +./css/IEFixes.js \ +./css/images/magnify-clip.png \ +./css/images/poweredby_mediawiki_88x31.png \ +./css/KHTMLFixes.css \ +./css/lock_icon.gif \ +./css/mail_icon.gif \ +./css/main.css \ +./css/MediaWiki_Common.css \ +./css/MediaWiki_Monobook.css \ +./css/news_icon.png \ +./css/pixie-docs.png \ +./css/pixie-wiki.png \ +./css/video.png \ +./css/wikibits.js \ +./css/WikiExtraCss.css \ +./css/WikiExtraJs.js \ +./Documentation/Attributes.html \ +./Documentation/Baking_3D_Textures.html \ +./Documentation/Conditional_RIB.html \ +./Documentation/Display_drivers.html \ +./Documentation/DSO_shading.html \ +./Documentation/Global_illumination.html \ +./Documentation/Hardcoded_shaders.html \ +./Documentation/Hiders.html \ +./Documentation/Installing_And_Running.html \ +./Documentation/Multithreading.html \ +./Documentation/Network_parallel_rendering.html \ +./Documentation/Occlusion_culling.html \ +./Documentation/Options.html \ +./Documentation/Performance_And_Quality_Tips.html \ +./Documentation/Ptc_API.html \ +./Documentation/Raytraced_shadows_and_reflections.html \ +./Documentation/Raytracing_from_C.html \ +./Documentation/Raytracing_in_SL.html \ +./Documentation/RIB_Resources.html \ +./Documentation/Shader_library.html \ +./Documentation/Source_at_a_first_glance.html \ +./Documentation/Source_at_a_Glance.html \ +./Documentation/Transparency_shadow_maps.html \ +./Documentation/User_Attributes_And_Options.html \ +./Documentation/Version_management.html \ +./Documentation.html \ +./Examples.html \ +./FAQ/Installing_On_OSX.html \ +./FAQ/Whats_Wrong_With_My_Render.html \ +./FAQ/Why_Wont_Pixie_Run.html \ +./FAQ.html \ +./favicon.ico \ +./images/2DBake.png \ +./images/2DBakeBetter.png \ +./images/Bake2DPointCloud.png \ +./images/CausticsPrismSphere.png \ +./images/DispersionPhotons.png \ +./images/DispersionTutorial.zip \ +./images/Docs_Caustic1.jpg \ +./images/Docs_Caustic2.jpg \ +./images/Docs_DirectPhoton.jpg \ +./images/Docs_ex1_beauty.jpg \ +./images/Docs_ex1_precompute.jpg \ +./images/Docs_ex3_beauty.jpg \ +./images/Docs_ex3g_beauty.jpg \ +./images/Docs_ex5_beauty.jpg \ +./images/GSHGiBakePass.jpg \ +./images/GSHGICullError.jpg \ +./images/GSHGIReusedError.png \ +./images/GSHICacheVis.png \ +./images/GSHPhotonMapVis.png \ +./images/RaytraceReflections.jpg \ +./images/Shadow1.jpg \ +./images/Shadow2.jpg \ +./images/Shadow3.jpg \ +./images/Shadow4.jpg \ +./images/TexDisplacePatchCrack.jpg \ +./index.html \ +./NotIncludedStatic.html \ +./NotSupportedStatic.html \ +./Previous_Releases.html \ +./StaticSite_NotIncludedStatic.html \ +./thumbs/1/16/DispersionPhotons.png/400px-DispersionPhotons.png \ +./thumbs/1/1f/Docs_ex3_beauty.jpg/320px-Docs_ex3_beauty.jpg \ +./thumbs/4/40/Docs_ex5_beauty.jpg/320px-Docs_ex5_beauty.jpg \ +./thumbs/4/47/Docs_ex1_beauty.jpg/160px-Docs_ex1_beauty.jpg \ +./thumbs/4/47/Docs_ex1_beauty.jpg/320px-Docs_ex1_beauty.jpg \ +./thumbs/4/4e/Docs_DirectPhoton.jpg/320px-Docs_DirectPhoton.jpg \ +./thumbs/5/52/Docs_Caustic1.jpg/320px-Docs_Caustic1.jpg \ +./thumbs/5/54/Docs_ex3g_beauty.jpg/320px-Docs_ex3g_beauty.jpg \ +./thumbs/7/7c/Docs_Caustic2.jpg/320px-Docs_Caustic2.jpg \ +./thumbs/8/8c/GSHICacheVis.png/180px-GSHICacheVis.png \ +./thumbs/c/c7/GSHPhotonMapVis.png/180px-GSHPhotonMapVis.png \ +./thumbs/d/d6/GSHGIReusedError.png/180px-GSHGIReusedError.png \ +./thumbs/e/e6/Docs_ex1_precompute.jpg/320px-Docs_ex1_precompute.jpg \ +./Tutorials/BakeToTexture.html \ +./Tutorials/Basics_Running_Pixie.html \ +./Tutorials/Dispersion.html \ +./Tutorials/Global_Illumination.html \ +./Tutorials/Raytraced_shadows.html \ +./Tutorials/Soft_raytraced_shadows.html \ +./Tutorials.html -nobase_doc_DATA = \ - *.ico \ - *.html \ - css/* \ - css/images/* \ - Documentation/* \ - Tutorials/* \ - FAQ/* \ - images/* \ - thumbs/*/* \ - thumbs/*/*/* \ - thumbs/*/*/*/* - +EXTRA_DIST = $(nobase_doc_DATA) Index: Makefile.am =================================================================== --- Makefile.am (revision 946) +++ Makefile.am (working copy) @@ -1,8 +1,36 @@ -SUBDIRS = src doc +SUBDIRS = src shaders doc man -man_MANS = man/rndr.1 man/sdrc.1 man/sdrinfo.1 man/texmake.1 +nobase_doc_DATA = AUTHORS ChangeLog COPYING DEVNOTES NEWS README -nobase_doc_DATA = AUTHORS ChangeLog COPYING DEVNOTES LICENSE NEWS README - -shader_DATA = shaders/* - +EXTRA_DIST = COMPILING.txt \ +DEVNOTES \ +config.windows.h \ +config.xcode.h \ +pixie.spec \ +native-endings.sh \ +lines_tounix.sh \ +osxinst/osxinstaller.pmproj \ +textures/checkers.tif \ +textures/logo.tif \ +win32inst/logo.bmp \ +win32inst/logoSmall.bmp \ +win32inst/PixieW32Setup.iss \ +windows/vcnet8/Pixie/common/common.vcproj \ +windows/vcnet8/Pixie/dsotest/dsotest.vcproj \ +windows/vcnet8/Pixie/file/file.vcproj \ +windows/vcnet8/Pixie/framebuffer/framebuffer.vcproj \ +windows/vcnet8/Pixie/gui/gui.vcproj \ +windows/vcnet8/Pixie/openexr/openexr.vcproj \ +windows/vcnet8/Pixie/Pixie.sln \ +windows/vcnet8/Pixie/precomp/precomp.vcproj \ +windows/vcnet8/Pixie/rgbe/rgbe.vcproj \ +windows/vcnet8/Pixie/ri/ri.vcproj \ +windows/vcnet8/Pixie/rndr/rndr.vcproj \ +windows/vcnet8/Pixie/sdr/sdr.vcproj \ +windows/vcnet8/Pixie/sdrc/sdrc.vcproj \ +windows/vcnet8/Pixie/sdrinfo/sdrinfo.vcproj \ +windows/vcnet8/Pixie/show/show.vcproj \ +windows/vcnet8/Pixie/texmake/texmake.vcproj \ +xcode/pixie/pixie.xcodeproj/okan.mode1 \ +xcode/pixie/pixie.xcodeproj/okan.pbxuser \ +xcode/pixie/pixie.xcodeproj/project.pbxproj Index: man/Makefile.am =================================================================== --- man/Makefile.am (revision 0) +++ man/Makefile.am (revision 0) @@ -0,0 +1,3 @@ +man_MANS = rndr.1 sdrc.1 sdrinfo.1 texmake.1 +EXTRA_DIST = rndr.1 sdrc.1 sdrinfo.1 texmake.1 +