diff --git a/celestia/Makefile.am b/celestia/Makefile.am index c771710..916a321 100644 --- a/celestia/Makefile.am +++ b/celestia/Makefile.am @@ -7,7 +7,9 @@ dosstuff = \ celestia.iss \ celestia.sln \ celestia.vcproj \ - $(wildcard *.bat) + makedebug.bat \ + makerelease.bat \ + # noinst_DATA = \ coding-standards.html \ @@ -18,7 +20,10 @@ pkgdata_DATA = \ celestia.cfg \ controls.txt \ COPYING \ - $(wildcard *.cel) + demo.cel \ + guide.cel \ + start.cel \ + # EXTRA_DIST = \ $(pkgdata_DATA) \ diff --git a/celestia/data/Makefile.am b/celestia/data/Makefile.am index 1d70005..70cc98a 100644 --- a/celestia/data/Makefile.am +++ b/celestia/data/Makefile.am @@ -10,12 +10,51 @@ endif BUILT_SOURCES = $(HIP_DAT) pkgdata_DATA = \ - $(wildcard *.ssc) \ - $(wildcard *.dat) \ - $(wildcard *.xyz) \ - $(wildcard *.xyzv) \ - $(wildcard *.dsc) \ - $(wildcard *.stc) + asteroids.ssc \ + comets.ssc \ + earth_locs.ssc \ + eros_locs.ssc \ + extrasolar.ssc \ + gaspra_locs.ssc \ + ida_locs.ssc \ + itokawa_locs.ssc \ + jupitermoons_locs.ssc \ + mars_locs.ssc \ + marsmoons_locs.ssc \ + merc_locs.ssc \ + minormoons.ssc \ + moon_locs.ssc \ + neptunemoons_locs.ssc \ + numberedmoons.ssc \ + outersys.ssc \ + ring_locs.ssc \ + saturnmoons_locs.ssc \ + solarsys.ssc \ + uranusmoons_locs.ssc \ + venus_locs.ssc \ + world-capitals.ssc \ + asterisms.dat \ + boundaries.dat \ + hdxindex.dat \ + saoxindex.dat \ + starnames.dat \ + stars.dat \ + galaxies.dsc \ + globulars.dsc \ + charm2.stc \ + extrasolar.stc \ + nearstars.stc \ + revised.stc \ + spectbins.stc \ + visualbins.stc \ + # + +# $(wildcard *.ssc) \ +# $(wildcard *.dat) \ +# $(wildcard *.xyz) \ +# $(wildcard *.xyzv) \ +# $(wildcard *.dsc) \ +# $(wildcard *.stc) EXTRA_DIST = \ $(pkgdata_DATA) \ diff --git a/celestia/extras/Makefile.am b/celestia/extras/Makefile.am index 23c9128..cbf7eda 100644 --- a/celestia/extras/Makefile.am +++ b/celestia/extras/Makefile.am @@ -1,6 +1,11 @@ pkgdatadir = @datadir@/@PACKAGE@/extras -pkgdata_DATA = $(wildcard *.ssc) +pkgdata_DATA = \ + apollo.ssc \ + shroxclassic.ssc \ + shroxmars.ssc \ + skylab.ssc \ + # +#pkgdata_DATA = $(wildcard *.ssc) EXTRA_DIST = $(pkgdata_DATA) - diff --git a/celestia/fonts/Makefile.am b/celestia/fonts/Makefile.am index 90d4499..506ae11 100644 --- a/celestia/fonts/Makefile.am +++ b/celestia/fonts/Makefile.am @@ -1,5 +1,43 @@ pkgdatadir = @datadir@/@PACKAGE@/fonts -pkgdata_DATA = $(wildcard *.txf) +pkgdata_DATA = \ + clean12.txf \ + clean16.txf \ + cleanbold12.txf \ + cleanbold16.txf \ + default.txf \ + helv10.txf \ + helv12.txf \ + helv18.txf \ + helv24.txf \ + helvbold12.txf \ + helvbold18.txf \ + helvbold24.txf \ + sans10.txf \ + sans12_bg.txf \ + sans12_ja.txf \ + sans12_ko.txf \ + sans12_ru.txf \ + sans12.txf \ + sans12_uk.txf \ + sans12_zh_CN.txf \ + sans14_ja.txf \ + sans14_ko.txf \ + sans14_ru.txf \ + sans14.txf \ + sans14_uk.txf \ + sans14_zh_CN.txf \ + sans20.txf \ + sansbold10.txf \ + sansbold12.txf \ + sansbold14.txf \ + sansbold20_bg.txf \ + sansbold20_ja.txf \ + sansbold20_ko.txf \ + sansbold20_ru.txf \ + sansbold20.txf \ + sansbold20_uk.txf \ + sansbold20_zh_CN.txf \ + # EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/locale/Makefile.am b/celestia/locale/Makefile.am index ce9a109..084422a 100644 --- a/celestia/locale/Makefile.am +++ b/celestia/locale/Makefile.am @@ -1,5 +1,88 @@ pkgdatadir = @datadir@/@PACKAGE@/ -pkgdata_DATA = $(wildcard COPYING_*) $(wildcard controls_*.txt) $(wildcard *.cel) +pkgdata_DATA = \ + COPYING_bg \ + COPYING_de \ + COPYING_es \ + COPYING_fr \ + COPYING_it \ + COPYING_ja \ + COPYING_ko \ + COPYING_pl \ + COPYING_pt \ + COPYING_pt_BR \ + COPYING_ru \ + COPYING_sv \ + COPYING_uk \ + COPYING_zh_CN \ + controls_bg.txt \ + controls_de.txt \ + controls_es.txt \ + controls_fr.txt \ + controls_it.txt \ + controls_ja.txt \ + controls_ko.txt \ + controls_nl.txt \ + controls_pl.txt \ + controls_pt_BR.txt \ + controls_pt.txt \ + controls_ru.txt \ + controls_sv.txt \ + controls_uk.txt \ + controls_zh_CN.txt \ + demo_de.cel \ + demo_es.cel \ + demo_fr.cel \ + demo_it.cel \ + demo_ja.cel \ + demo_ko.cel \ + demo_lt.cel \ + demo_lv.cel \ + demo_nl.cel \ + demo_pl.cel \ + demo_pt_BR.cel \ + demo_pt.cel \ + demo_ru.cel \ + demo_sv.cel \ + demo_tr.cel \ + demo_uk.cel \ + demo_zh_CN.cel \ + guide_bg.cel \ + guide_de.cel \ + guide_es.cel \ + guide_fr.cel \ + guide_it.cel \ + guide_ja.cel \ + guide_ko.cel \ + guide_lt.cel \ + guide_nl.cel \ + guide_pl.cel \ + guide_pt_BR.cel \ + guide_pt.cel \ + guide_ru.cel \ + guide_sv.cel \ + guide_uk.cel \ + guide_zh_CN.cel \ + start_bg.cel \ + start_de.cel \ + start_es.cel \ + start_fr.cel \ + start_hu.cel \ + start_it.cel \ + start_ja.cel \ + start_ko.cel \ + start_lt.cel \ + start_lv.cel \ + start_nl.cel \ + start_pl.cel \ + start_pt_BR.cel \ + start_pt.cel \ + start_ru.cel \ + start_sv.cel \ + start_uk.cel \ + start_zh_CN.cel \ + # + +#pkgdata_DATA = $(wildcard COPYING_*) $(wildcard controls_*.txt) $(wildcard *.cel) EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/models/Makefile.am b/celestia/models/Makefile.am index 787ad42..0e4be2b 100644 --- a/celestia/models/Makefile.am +++ b/celestia/models/Makefile.am @@ -1,10 +1,75 @@ pkgdatadir = @datadir@/@PACKAGE@/models pkgdata_DATA = \ - $(wildcard *.3ds) \ - $(wildcard *.cmod) \ - $(wildcard *.cms) \ - $(wildcard *.png) + amalthea.3ds \ + apollo.3ds \ + bacchus.3ds \ + castalia.3ds \ + deimos.3ds \ + epimetheus.3ds \ + eros.3ds \ + gaspra.3ds \ + gemini.3ds \ + geographos.3ds \ + golevka.3ds \ + halley.3ds \ + hyperion.3ds \ + ida.3ds \ + janus.3ds \ + kleopatra.3ds \ + ky26.3ds \ + larissa.3ds \ + marsglobalsurvr.3ds \ + marsodyssey.3ds \ + mercury7.3ds \ + pandora.3ds \ + phobos.3ds \ + phoebe.3ds \ + prometheus.3ds \ + proteus.3ds \ + skylab.3ds \ + toutatis.3ds \ + vesta.3ds \ + amalthea.cmod \ + bacchus.cmod \ + castalia.cmod \ + deimos.cmod \ + epimetheus.cmod \ + eros.cmod \ + gaspra.cmod \ + geographos.cmod \ + golevka.cmod \ + halley.cmod \ + hyperion.cmod \ + ida.cmod \ + itokawa.cmod \ + janus.cmod \ + kleopatra.cmod \ + ky26.cmod \ + larissa.cmod \ + pandora.cmod \ + phobos.cmod \ + phoebe.cmod \ + prometheus.cmod \ + proteus.cmod \ + toutatis.cmod \ + vesta.cmod \ + asteroid.cms \ + borrelly.cms \ + eros.cms \ + hyperion.cms \ + proteus.cms \ + roughsphere.cms \ + E0.png \ + MilkyWay.png \ + S0.png \ + Sa.png \ + SBa.png \ + SBb.png \ + SBc.png \ + Sb.png \ + Sc.png \ + # EXTRA_DIST = \ $(pkgdata_DATA) diff --git a/celestia/shaders/Makefile.am b/celestia/shaders/Makefile.am index 42ba5a9..a5d392f 100644 --- a/celestia/shaders/Makefile.am +++ b/celestia/shaders/Makefile.am @@ -1,5 +1,52 @@ pkgdatadir = @datadir@/@PACKAGE@/shaders -pkgdata_DATA = $(wildcard *.vp) $(wildcard *.fp) +pkgdata_DATA = \ + bumpdiffuse_arb_hdr.vp \ + bumpdiffuse_arb.vp \ + bumpdiffuse.vp \ + bumphaze_arb_hdr.vp \ + bumphaze_arb.vp \ + bumphaze.vp \ + diffuse2_arb.vp \ + diffuse_arb.vp \ + diffuse_texoff2_arb.vp \ + diffuse_texoff_arb.vp \ + diffuse_texoff.vp \ + diffuse.vp \ + ell_galaxy_arb.vp \ + glossmap_arb.vp \ + haze2_arb.vp \ + haze_arb.vp \ + haze.vp \ + multishadow_arb.vp \ + night2_arb_hdr.vp \ + night2_arb.vp \ + night_arb_hdr.vp \ + night_arb.vp \ + night.vp \ + rings_arb.vp \ + ringshadow_arb.vp \ + ringshadow.vp \ + rings.vp \ + shadowtex_arb.vp \ + shadowtex.vp \ + simple_arb.vp \ + simple.vp \ + specular2_arb.vp \ + specular_arb.vp \ + specular.vp \ + star_arb.vp \ + texphong_alpha_arb.vp \ + texphong_arb.vp \ + bumpdiffuse_nv.fp \ + diffuse_nv.fp \ + eclipse1_nv.fp \ + eclipse2_nv.fp \ + shadow_on_rings_nv.fp \ + texphong_alpha_nv.fp \ + texphong_nv.fp \ + # + +#pkgdata_DATA = $(wildcard *.vp) $(wildcard *.fp) EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/src/cel3ds/Makefile.am b/celestia/src/cel3ds/Makefile.am index f555d87..0bec26e 100644 --- a/celestia/src/cel3ds/Makefile.am +++ b/celestia/src/cel3ds/Makefile.am @@ -5,7 +5,7 @@ noinst_DATA = $(dosstuff) EXTRA_DIST = $(noinst_DATA) -INCLUDES = -I.. +INCLUDES = -I$(top_srcdir)/src libcel3ds_a_SOURCES = \ 3dsmodel.cpp \ diff --git a/celestia/src/celengine/Makefile.am b/celestia/src/celengine/Makefile.am index 38548de..f4f65ee 100644 --- a/celestia/src/celengine/Makefile.am +++ b/celestia/src/celengine/Makefile.am @@ -8,7 +8,7 @@ EXTRA_DIST = \ 3dsmesh.cpp \ solarsysxml.cpp -INCLUDES = -I.. +INCLUDES = -I$(top_srcdir)/src if ENABLE_SPICE SPICESOURCES = spiceinterface.cpp spiceorbit.cpp spicerotation.cpp diff --git a/celestia/src/celestia/Makefile.am b/celestia/src/celestia/Makefile.am index 270c7a8..3d75b86 100644 --- a/celestia/src/celestia/Makefile.am +++ b/celestia/src/celestia/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = res bin_PROGRAMS = celestia -INCLUDES = -I.. +INCLUDES = -I$(top_srcdir)/src DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@ diff --git a/celestia/src/celestia/gtk/Makefile.am b/celestia/src/celestia/gtk/Makefile.am index cdd97ec..f2d9fcb 100644 --- a/celestia/src/celestia/gtk/Makefile.am +++ b/celestia/src/celestia/gtk/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = data -INCLUDES = -I../.. +INCLUDES = -I$(top_srcdir)/src DEFS = -DCONFIG_DATA_DIR='"$(PKGDATADIR)"' -DLOCALEDIR='"$(datadir)/locale"' @DEFS@ diff --git a/celestia/src/celestia/kde/Makefile.am b/celestia/src/celestia/kde/Makefile.am index 87b8f9c..67981c6 100644 --- a/celestia/src/celestia/kde/Makefile.am +++ b/celestia/src/celestia/kde/Makefile.am @@ -30,7 +30,7 @@ if ENABLE_KDE noinst_LIBRARIES = libkdegui.a noinst_HEADERS = $(wildcard *.h) -INCLUDES = -I../.. -I.. $(QT_INCLUDES) $(KDE_INCLUDES) +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/celestia $(QT_INCLUDES) $(KDE_INCLUDES) libkdegui_a_SOURCES = \ celsplashscreen.moc.cpp \ @@ -60,7 +60,7 @@ endif $(UIC) $< -o $@ %.uic.cpp: %.uic.h - $(UIC) -impl $< $*.ui -o $@ + $(UIC) -impl $< $(top_srcdir)/src/celestia/kde/$*.ui -o $@ %.moc.cpp: %.h $(MOC) $< -o $@ diff --git a/celestia/src/celestia/kde/data/Makefile.am b/celestia/src/celestia/kde/data/Makefile.am index 44b2a6d..5f20019 100644 --- a/celestia/src/celestia/kde/data/Makefile.am +++ b/celestia/src/celestia/kde/data/Makefile.am @@ -3,7 +3,16 @@ rcdir = $(kde_datadir)/celestia rc_DATA = celestiaui.rc bookmarks.xml faviconsdir = $(kde_datadir)/celestia/favicons -favicons_DATA = $(wildcard celestia_*.png) +favicons_DATA = \ + celestia_20020830192652097.png \ + celestia_20020830192655186.png \ + celestia_20021210223316001.png \ + celestia_20021212191412299.png \ + celestia_20021215164511359.png \ + celestia_20021215164726547.png \ + celestia_20021215170159036.png \ + celestia_20030106235954721.png \ + # kdelnkdir = $(kde_servicesdir) kdelnk_DATA = celestia.protocol @@ -19,10 +28,12 @@ apps_DATA = celestia.desktop KDE_ICON = celestia -EXTRA_DIST = $(rc_DATA) $(favicons_DATA) $(favicons_DATA)\ - $(kdelnk_DATA) $(conf_DATA) $(mime_DATA)\ - $(apps_DATA) hi16-app-celestia.png\ - hi22-app-celestia.png\ - hi32-app-celestia.png\ - hi48-app-celestia.png +EXTRA_DIST = $(rc_DATA) $(favicons_DATA) $(favicons_DATA) \ + $(kdelnk_DATA) $(conf_DATA) $(mime_DATA) \ + $(apps_DATA) \ + hi16-app-celestia.png \ + hi22-app-celestia.png \ + hi32-app-celestia.png \ + hi48-app-celestia.png \ + # diff --git a/celestia/src/celmath/Makefile.am b/celestia/src/celmath/Makefile.am index b9f98ff..770b299 100644 --- a/celestia/src/celmath/Makefile.am +++ b/celestia/src/celmath/Makefile.am @@ -5,7 +5,7 @@ noinst_DATA = $(dosstuff) EXTRA_DIST = $(noinst_DATA) -INCLUDES = -I.. +INCLUDES = -I$(top_srcdir)/src libcelmath_a_SOURCES = \ frustum.cpp \ diff --git a/celestia/src/celtxf/Makefile.am b/celestia/src/celtxf/Makefile.am index b744815..d15503a 100644 --- a/celestia/src/celtxf/Makefile.am +++ b/celestia/src/celtxf/Makefile.am @@ -5,7 +5,7 @@ noinst_DATA = $(dosstuff) EXTRA_DIST = $(noinst_DATA) -INCLUDES = -I.. +INCLUDES = -I$(top_srcdir)/src libceltxf_a_SOURCES = \ texturefont.cpp diff --git a/celestia/textures/Makefile.am b/celestia/textures/Makefile.am index 15831b9..adb6ab1 100644 --- a/celestia/textures/Makefile.am +++ b/celestia/textures/Makefile.am @@ -2,6 +2,11 @@ pkgdatadir = @datadir@/@PACKAGE@/textures SUBDIRS = lores medres hires -pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) +pkgdata_DATA = \ + flare.jpg \ + logo.png \ + # + +#pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/textures/hires/Makefile.am b/celestia/textures/hires/Makefile.am index 6b4b8f7..cc82a1c 100644 --- a/celestia/textures/hires/Makefile.am +++ b/celestia/textures/hires/Makefile.am @@ -1,5 +1,19 @@ pkgdatadir = @datadir@/@PACKAGE@/textures/hires -pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) +pkgdata_DATA = \ + dione.jpg \ + enceladus.jpg \ + iapetus.jpg \ + mercury.jpg \ + mimas.jpg \ + moonbump.jpg \ + moon.jpg \ + phoebe.jpg \ + rhea.jpg \ + tethys.jpg \ + titan.jpg \ + # + +#pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/textures/lores/Makefile.am b/celestia/textures/lores/Makefile.am index 7843a4d..18e8e2f 100644 --- a/celestia/textures/lores/Makefile.am +++ b/celestia/textures/lores/Makefile.am @@ -1,5 +1,87 @@ pkgdatadir = @datadir@/@PACKAGE@/textures/lores -pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) +pkgdata_DATA = \ + amalthea.jpg \ + ariel.jpg \ + astar.jpg \ + asteroid.jpg \ + browndwarf.jpg \ + bstar.jpg \ + callisto.jpg \ + charon-lok.jpg \ + charon-lok-spec.jpg \ + deimos.jpg \ + dione.jpg \ + earthnight.jpg \ + enceladus.jpg \ + epimetheus.jpg \ + epimetheus-lok.jpg \ + eros.jpg \ + europa.jpg \ + exo-class1.jpg \ + exo-class2.jpg \ + exo-class3.jpg \ + exo-class4.jpg \ + exo-class4night.jpg \ + exo-class5.jpg \ + exo-class5night.jpg \ + extrasolar-lok.jpg \ + ganymede.jpg \ + gaspramosaic.jpg \ + gstar.jpg \ + hyperion.jpg \ + hyperion-lok.jpg \ + iapetus.jpg \ + idamosaic.jpg \ + io.jpg \ + janus.jpg \ + jupiter.jpg \ + marsbump.jpg \ + mars.jpg \ + mercury.jpg \ + mimas.jpg \ + miranda.jpg \ + moonbump.jpg \ + moon.jpg \ + mstar.jpg \ + neptune.jpg \ + oberon.jpg \ + phobos.jpg \ + phoebe.jpg \ + pluto-lok.jpg \ + pluto-lok-spec.jpg \ + prometheus.jpg \ + proteus.jpg \ + rhea.jpg \ + saturn.jpg \ + tethys.jpg \ + titan-clouds.jpg \ + titania.jpg \ + titan.jpg \ + triton.jpg \ + umbriel.jpg \ + uranus.jpg \ + venus.jpg \ + venuslike.jpg \ + venuslikenight.jpg \ + venussurface.jpg \ + ariel-lok-mask.png \ + callisto-lok-mask.png \ + earth-clouds.png \ + earth.png \ + europa-lok-mask.png \ + ganymede-lok-mask.png \ + io-lok-mask.png \ + miranda-lok-mask.png \ + neptune-rings.png \ + oberon-lok-mask.png \ + saturn-rings.png \ + titania-lok-mask.png \ + triton-lok-mask.png \ + umbriel-lok-mask.png \ + uranus-rings.png \ + # + +#pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) EXTRA_DIST = $(pkgdata_DATA) diff --git a/celestia/textures/medres/Makefile.am b/celestia/textures/medres/Makefile.am index ef36144..54e509b 100644 --- a/celestia/textures/medres/Makefile.am +++ b/celestia/textures/medres/Makefile.am @@ -1,5 +1,72 @@ pkgdatadir = @datadir@/@PACKAGE@/textures/medres -pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) +pkgdata_DATA = \ + amalthea.jpg \ + ariel.jpg \ + astar.jpg \ + asteroid.jpg \ + browndwarf.jpg \ + bstar.jpg \ + callisto.jpg \ + charon-lok.jpg \ + charon-lok-spec.jpg \ + deimos.jpg \ + dione.jpg \ + earthnight.jpg \ + enceladus.jpg \ + epimetheus.jpg \ + epimetheus-lok.jpg \ + eros.jpg \ + europa.jpg \ + exo-class1.jpg \ + exo-class2.jpg \ + exo-class3.jpg \ + exo-class4.jpg \ + exo-class4night.jpg \ + exo-class5.jpg \ + exo-class5night.jpg \ + ganymede.jpg \ + gaspramosaic.jpg \ + gstar.jpg \ + hyperion.jpg \ + hyperion-lok.jpg \ + iapetus.jpg \ + idamosaic.jpg \ + io.jpg \ + janus.jpg \ + jupiter.jpg \ + marsbump.jpg \ + mars.jpg \ + mercury.jpg \ + mimas.jpg \ + miranda.jpg \ + moonbump.jpg \ + moon.jpg \ + mstar.jpg \ + neptune.jpg \ + oberon.jpg \ + phobos.jpg \ + phoebe.jpg \ + pluto-lok.jpg \ + pluto-lok-spec.jpg \ + prometheus.jpg \ + proteus.jpg \ + rhea.jpg \ + saturn.jpg \ + tethys.jpg \ + titan-clouds.jpg \ + titania.jpg \ + titan.jpg \ + triton.jpg \ + umbriel.jpg \ + venus.jpg \ + venuslike.jpg \ + venuslikenight.jpg \ + venussurface.jpg \ + earth-clouds.png \ + earth.png \ + # + +#pkgdata_DATA = $(wildcard *.jpg) $(wildcard *.png) EXTRA_DIST = $(pkgdata_DATA)