Menu
▾
▴
[Opengate-svn] SF.net SVN: opengate: [878] trunk
|
From: <eg...@us...> - 2007-12-08 12:40:10
|
Revision: 878
http://opengate.svn.sourceforge.net/opengate/?rev=878&view=rev
Author: egore
Date: 2007-12-08 04:40:12 -0800 (Sat, 08 Dec 2007)
Log Message:
-----------
* data/Makefile.am, configure.ac: add some parts of the data to the
build system
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.ac
trunk/src/Makefile.am
Added Paths:
-----------
trunk/data/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-12-03 20:34:06 UTC (rev 877)
+++ trunk/ChangeLog 2007-12-08 12:40:12 UTC (rev 878)
@@ -1,3 +1,7 @@
+2007-12-08 Christoph Brill <ego...@eg...>
+ * data/Makefile.am, configure.ac: add some parts of the data to the
+ build system
+
2007-11-18 Christoph Brill <ego...@eg...>
* configure.ac: add some missing things gathered from running
autoscan, drop externals stuff
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-12-03 20:34:06 UTC (rev 877)
+++ trunk/Makefile.am 2007-12-08 12:40:12 UTC (rev 878)
@@ -1,5 +1,8 @@
-SUBDIRS = src
+AUTOMAKE_OPTIONS = dist-bzip2
+SUBDIRS = src \
+ data
+
distclean: maintainer-clean
rm -rf *~
rm -rf autom4te.cache
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-12-03 20:34:06 UTC (rev 877)
+++ trunk/configure.ac 2007-12-08 12:40:12 UTC (rev 878)
@@ -21,7 +21,7 @@
AC_FUNC_STAT
AC_FUNC_STRTOD
AC_HEADER_STDBOOL
-AC_PROG_RANLIB
+#AC_PROG_RANLIB
AC_STRUCT_TM
AC_TYPE_SIGNAL
AC_TYPE_SIZE_T
@@ -92,6 +92,7 @@
AC_OUTPUT([
Makefile
+data/Makefile
src/Makefile
])
Added: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am (rev 0)
+++ trunk/data/Makefile.am 2007-12-08 12:40:12 UTC (rev 878)
@@ -0,0 +1,382 @@
+
+asteroids_DATA = \
+ asteroids/asteroid.material\
+ asteroids/asteroid.png \
+ asteroids/asteroid01.mesh \
+ asteroids/asteroidBump.png \
+ asteroids/ice_oval.material \
+ asteroids/ice_oval.png \
+ asteroids/ice_oval_6.mesh \
+ asteroids/ice_oval_7.mesh \
+ asteroids/ice_oval_8.mesh \
+ asteroids/ice_oval_9.mesh \
+ asteroids/ice_oval_10.mesh \
+ asteroids/normal_oval.material \
+ asteroids/normal_oval.png \
+ asteroids/normal_oval_1.mesh \
+ asteroids/normal_oval_2.mesh \
+ asteroids/normal_oval_3.mesh \
+ asteroids/normal_oval_4.mesh \
+ asteroids/normal_oval_5.mesh
+
+EXTRA_DIST = \
+ $(asteroids_DATA)\
+ $(capacitors_DATA) \
+ $(commodities_DATA) \
+ $(ecms_DATA) \
+ $(engines_DATA) \
+ $(power_plants_DATA) \
+ $(rankings_DATA) \
+ $(radars_DATA) \
+ $(guns_DATA) \
+ $(shields_DATA) \
+ $(stations_DATA)
+
+asteroidsdir = \
+ $(pkgdatadir)/asteroids
+
+capacitors_DATA = \
+ capacitors/alembic.xml\
+ capacitors/alembic_big.png \
+ capacitors/alembic_small.png \
+ capacitors/deepol.xml \
+ capacitors/deepol_big.png \
+ capacitors/deepol_small.png \
+ capacitors/germ.xml \
+ capacitors/germ_big.png \
+ capacitors/germ_small.png \
+ capacitors/jar.xml \
+ capacitors/jar_big.png \
+ capacitors/jar_small.png \
+ capacitors/lifeline.xml \
+ capacitors/lifeline_big.png \
+ capacitors/lifeline_small.png \
+ capacitors/Makefile.am \
+ capacitors/mantra.xml \
+ capacitors/mantra_big.png \
+ capacitors/mantra_small.png \
+ capacitors/outlet.xml \
+ capacitors/outlet_big.png \
+ capacitors/outlet_small.png \
+ capacitors/quadro.xml \
+ capacitors/quadro_big.png \
+ capacitors/quadro_small.png \
+ capacitors/sponge.xml \
+ capacitors/sponge_big.png \
+ capacitors/sponge_small.png \
+ capacitors/summoner.xml \
+ capacitors/summoner_big.png \
+ capacitors/summoner_small.png \
+ capacitors/tank.xml \
+ capacitors/tank_big.png \
+ capacitors/tank_small.png \
+ capacitors/t-c-15.xml \
+ capacitors/t-c-15_big.png \
+ capacitors/t-c-15_small.png
+
+commodities_DATA = \
+ commodities/aluminium.xml\
+ commodities/aluminium_big.png \
+ commodities/aluminium_small.png \
+ commodities/ammunition.xml \
+ commodities/ammunition_big.png \
+ commodities/ammunition_small.png \
+ commodities/antimony.xml \
+ commodities/antimony_big.png \
+ commodities/antimony_small.png \
+ commodities/armor.xml \
+ commodities/armor_big.png \
+ commodities/armor_small.png \
+ commodities/barium.png \
+ commodities/barium.xml \
+ commodities/boron.xml \
+ commodities/boron_big.png \
+ commodities/boron_small.png \
+ commodities/cesium.xml \
+ commodities/cesium_big.png \
+ commodities/cesium_small.png \
+ commodities/chemicals.xml \
+ commodities/chemicals_big.png \
+ commodities/chemicals_small.png \
+ commodities/chromium.xml \
+ commodities/chromium_big.png \
+ commodities/chromium_small.png \
+ commodities/copper.xml \
+ commodities/copper_big.png \
+ commodities/copper_small.png \
+ commodities/cpus.xml \
+ commodities/cpus_big.png \
+ commodities/cpus_small.png \
+ commodities/electronics.xml \
+ commodities/electronics_big.png \
+ commodities/electronics_small.png \
+ commodities/fiber_optics.xml \
+ commodities/fiber_optics_big.png \
+ commodities/fiber_optics_small.png \
+ commodities/fuel_cells.xml \
+ commodities/fuel_cells_big.png \
+ commodities/fuel_cells_small.png \
+ commodities/gold.xml \
+ commodities/gold_big.png \
+ commodities/gold_small.png \
+ commodities/helium.xml \
+ commodities/helium_big.png \
+ commodities/helium_small.png \
+ commodities/ice.xml \
+ commodities/ice_big.png \
+ commodities/ice_small.png \
+ commodities/iron.xml \
+ commodities/iron_big.png \
+ commodities/iron_small.png \
+ commodities/laser_components.xml \
+ commodities/laser_components_big.png \
+ commodities/laser_components_small.png \
+ commodities/lumber.xml \
+ commodities/lumber_big.png \
+ commodities/lumber_small.png \
+ commodities/magnetic_components.png \
+ commodities/magnetic_components.xml \
+ commodities/manufactured_foods.xml \
+ commodities/manufactured_foods_big.png \
+ commodities/manufactured_foods_small.png \
+ commodities/medical_supplies.xml \
+ commodities/medical_supplies_big.png \
+ commodities/medical_supplies_small.png \
+ commodities/nitrogen.xml \
+ commodities/nitrogen_big.png \
+ commodities/nitrogen_small.png \
+ commodities/octavia_light.xml \
+ commodities/octavia_light_big.png \
+ commodities/octavia_light_small.png \
+ commodities/organic_foods.xml \
+ commodities/organic_foods_big.png \
+ commodities/organic_foods_small.png \
+ commodities/plutonium.xml \
+ commodities/plutonium_big.png \
+ commodities/plutonium_small.png \
+ commodities/power_converters.xml \
+ commodities/power_converters_big.png \
+ commodities/power_converters_small.png \
+ commodities/prostheses.xml \
+ commodities/prostheses_big.png \
+ commodities/prostheses_small.png \
+ commodities/ram.xml \
+ commodities/ram_big.png \
+ commodities/ram_small.png \
+ commodities/rubber.xml \
+ commodities/rubber_big.png \
+ commodities/rubber_small.png \
+ commodities/squadrok_biomass.xml \
+ commodities/squadrok_biomass_big.png \
+ commodities/squadrok_biomass_small.png \
+ commodities/tauseti_flashback.xml \
+ commodities/tauseti_flashback_big.png \
+ commodities/tauseti_flashback_small.png \
+ commodities/unsigned_box.xml \
+ commodities/unsigned_box_big.png \
+ commodities/unsigned_box_small.png \
+ commodities/uranium.xml \
+ commodities/uranium_big.png \
+ commodities/uranium_small.png \
+ commodities/water.xml \
+ commodities/water_big.png \
+ commodities/water_small.png \
+ commodities/xenon.xml \
+ commodities/xenon_big.png \
+ commodities/xenon_small.png \
+ commodities/zinc.xml \
+ commodities/zinc_big.png \
+ commodities/zinc_small.png
+
+commoditiesdir = \
+ $(pkgdatadir)/commodities
+
+capacitorsdir = \
+ $(pkgdatadir)/capacitors
+
+ecms_DATA = \
+ ecms/ghost.xml
+
+engines_DATA = \
+ engines/money.xml\
+ engines/money_big.png \
+ engines/money_small.png \
+ engines/t-e-15.xml \
+ engines/t-e-15_big.png \
+ engines/t-e-15_small.png
+
+power_plants_DATA = \
+ power_plants/contender.xml\
+ power_plants/contender_big.png \
+ power_plants/contender_small.png \
+ power_plants/contender_xl.xml \
+ power_plants/contender_xl_big.png \
+ power_plants/contender_xl_small.png \
+ power_plants/contender_xpr.xml \
+ power_plants/contender_xpr_big.png \
+ power_plants/contender_xpr_small.png \
+ power_plants/gatherer.xml \
+ power_plants/gatherer_big.png \
+ power_plants/gatherer_small.png \
+ power_plants/spud.xml \
+ power_plants/spud_big.png \
+ power_plants/spud_small.png \
+ power_plants/t-p-16.xml \
+ power_plants/t-p-16_big.png \
+ power_plants/t-p-16_small.png
+
+rankings_DATA = \
+ rankings/00.png\
+ rankings/01.png \
+ rankings/02.png \
+ rankings/03.png \
+ rankings/04.png \
+ rankings/05.png \
+ rankings/06.png \
+ rankings/07.png \
+ rankings/08.png \
+ rankings/09.png \
+ rankings/10.png \
+ rankings/11.png \
+ rankings/12.png \
+ rankings/13.png \
+ rankings/14.png \
+ rankings/15.png \
+ rankings/16.png \
+ rankings/17.png \
+ rankings/18.png \
+ rankings/19.png \
+ rankings/20.png \
+ rankings/21.png \
+ rankings/22.png \
+ rankings/23.png \
+ rankings/24.png \
+ rankings/25.png \
+ rankings/26.png \
+ rankings/27.png \
+ rankings/28.png \
+ rankings/29.png \
+ rankings/30.png \
+ rankings/31.png \
+ rankings/32.png \
+ rankings/33.png \
+ rankings/34.png \
+ rankings/35.png \
+ rankings/36.png \
+ rankings/37.png \
+ rankings/38.png \
+ rankings/39.png \
+ rankings/40.png \
+ rankings/41.png \
+ rankings/42.png \
+ rankings/43.png \
+ rankings/44.png \
+ rankings/45.png \
+ rankings/46.png \
+ rankings/47.png \
+ rankings/48.png \
+ rankings/49.png \
+ rankings/50.png
+
+radars_DATA = \
+ radars/chime.xml\
+ radars/chime_big.png \
+ radars/chime_small.png \
+ radars/cyclops.xml \
+ radars/cyclops_big.png \
+ radars/cyclops_small.png \
+ radars/hall_monitor.xml \
+ radars/hall_monitor_big.png \
+ radars/hall_monitor_small.png \
+ radars/knocker.xml \
+ radars/knocker_big.png \
+ radars/knocker_small.png \
+ radars/night_watchman.xml \
+ radars/night_watchman_big.png \
+ radars/night_watchman_small.png \
+ radars/outlook.xml \
+ radars/outlook_big.png \
+ radars/outlook_small.png \
+ radars/t-r-9.xml \
+ radars/t-r-9_big.png \
+ radars/t-r-9_small.png
+
+guns_DATA = \
+ guns/bender.xml\
+ guns/bender_big.png \
+ guns/bender_small.png \
+ guns/duster.xml \
+ guns/duster_big.png \
+ guns/duster_small.png \
+ guns/excavator.xml \
+ guns/excavator_big.png \
+ guns/excavator_small.png \
+ guns/liar.xml \
+ guns/liar_big.png \
+ guns/liar_small.png \
+ guns/t-g-28.xml \
+ guns/t-g-28_big.png \
+ guns/t-g-28_small.png
+
+shields_DATA = \
+ shields/alpaa.xml\
+ shields/alpaa_big.png \
+ shields/alpaa_small.png \
+ shields/flatiron.xml \
+ shields/flatiron_big.png \
+ shields/flatiron_small.png \
+ shields/himelea.xml \
+ shields/himelea_big.png \
+ shields/himelea_small.png \
+ shields/kydango.xml \
+ shields/kydango_big.png \
+ shields/kydango_small.png \
+ shields/pod.xml \
+ shields/pod_big.png \
+ shields/pod_small.png \
+ shields/shelter.xml \
+ shields/shelter_big.png \
+ shields/shelter_small.png \
+ shields/t-s-13.xml \
+ shields/t-s-13_big.png \
+ shields/t-s-13_small.png
+
+stations_DATA = \
+ stations/octavius_core.xml\
+ stations/tauseti_core.xml \
+ stations/TausetiStationBackground.png \
+ stations/TausetiStationBackground.xcf \
+ stations/TausetiStationBackgroundBM.png \
+ stations/TausetiStationBackgroundPlain.png \
+ stations/TausetiStationWindow.png \
+ stations/TausetiStationWindow.xcf \
+ stations/TausetiStationWindowBM.png \
+ stations/tauseti_wake.mesh \
+ stations/tauseti_wake.xml
+
+enginesdir = \
+ $(pkgdatadir)/engines
+
+radarsdir = \
+ $(pkgdatadir)/radars
+
+rankingsdir = \
+ $(pkgdatadir)/rankings
+
+shieldsdir = \
+ $(pkgdatadir)/shields
+
+power_plantsdir = \
+ $(pkgdatadir)/power_plants
+
+gunsdir = \
+ $(pkgdatadir)/guns
+
+stationsdir = \
+ $(pkgdatadir)/stations
+
+ecmsdir = \
+ $(pkgdatadir)/ecms
+
+## File created by the gnome-build tools
+
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2007-12-03 20:34:06 UTC (rev 877)
+++ trunk/src/Makefile.am 2007-12-08 12:40:12 UTC (rev 878)
@@ -1,7 +1,6 @@
bin_PROGRAMS = \
opengateclient \
opengateserver
-# testopenalmanager
opengateclient_SOURCES = \
opengateclient.cpp \
@@ -72,17 +71,17 @@
metaserver.h \
metaserver.cpp
-opengateclient_LDFLAGS = \
- $(OGRE_LIBS) \
- $(CEGUI_LIBS) \
- $(CEGUIOGRE_LIBS) \
- $(freealut_LIBS) \
- $(vorbisfile_LIBS) \
- $(OIS_LIBS) \
+opengateclient_LDFLAGS = \
+ $(OGRE_LIBS) \
+ $(CEGUI_LIBS) \
+ $(CEGUIOGRE_LIBS) \
+ $(freealut_LIBS) \
+ $(vorbisfile_LIBS) \
+ $(OIS_LIBS) \
$(ogreopcode_LIBS)
opengateclient_CXXFLAGS = \
- $(OGRE_CFLAGS) \
+ $(OGRE_CFLAGS) \
$(CEGUI_CFLAGS) \
$(ogreopcode_CFLAGS)
@@ -101,12 +100,11 @@
metaserver.h \
metaserver.cpp
-opengateserver_LDFLAGS =
-# $(OGRE_LIBS) \
-# $(OIS_LIBS)
+opengateserver_LDFLAGS = \
+ $(ogreopcode_LIBS)
-opengateserver_CXXFLAGS =
-# $(OGRE_CFLAGS)
+opengateserver_CXXFLAGS = \
+ $(ogreopcode_CFLAGS)
#testopenalmanager_SOURCES = \
# testopenalmanager.cpp \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
