[Pingus-CVS] r2532 - in trunk: . src src/components src/editor src/tinygettext

[grumbel at BerliOS]

Author: grumbel
Date: 2005-12-02 17:10:04 +0100 (Fri, 02 Dec 2005)
New Revision: 2532

Modified:
   trunk/SConstruct
   trunk/src/Makefile.am
   trunk/src/components/Makefile.am
   trunk/src/editor/
   trunk/src/editor/Makefile.am
   trunk/src/tinygettext/
Log:
- fixed makefiles

Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct    2005-12-02 14:35:35 UTC (rev 2531)
+++ trunk/SConstruct    2005-12-02 16:10:04 UTC (rev 2532)
@@ -18,6 +18,31 @@
 ##  along with this program; if not, write to the Free Software
 ##  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-SConscript('src/SConscript')
+import sys, os
 
+opts = Options(['options.cache', 'custom.py'])
+opts.Add('CXX', 'The C++ compiler')
+opts.Add('PKG_CONFIG_PATH', 'Path for pkg-config files')
+
+env = Environment(options=opts)
+
+def CheckPKG_CONFIG_DIR(context):
+    context.Message( 'Checking for PKG_CONFIG_PATH environment variable... ')
+    if os.environ.has_key('PKG_CONFIG_PATH'):
+        context.Result(os.environ['PKG_CONFIG_PATH'])
+        return 1
+    else:
+        context.Result('not set')
+        return 0
+
+if 'configure' in COMMAND_LINE_TARGETS:
+    conf = Configure( env, custom_tests = { 'CheckPKG_CONFIG_DIR' : 
CheckPKG_CONFIG_DIR })
+    if conf.CheckPKG_CONFIG_DIR():
+        os.environ['PKG_CONFIG_PATH']
+    
+    env = conf.Finish() 
+else:
+    Export('env')
+    SConscript('src/SConscript')
+
 ## EOF ##

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am       2005-12-02 14:35:35 UTC (rev 2531)
+++ trunk/src/Makefile.am       2005-12-02 16:10:04 UTC (rev 2532)
@@ -28,12 +28,14 @@
        actions             \
        caimagemanipulation \
        colliders           \
+       components          \
        editor              \
         gui                 \
         input               \
        movers              \
        particles           \
        sound               \
+       tinygettext         \
         worldobjs           \
        worldmap
 
@@ -61,13 +63,13 @@
         particles/libpingus_particle.a  \
         sound/libpingus_sound.a  \
         worldmap/libpingus_worldmap.a \
-       gui/libpingus_gui.a \
         input/libpingus_input.a \
         input/axes/libpingus_input_axes.a \
         input/buttons/libpingus_input_buttons.a \
        input/pointers/libpingus_input_pointers.a \
        input/scrollers/libpingus_input_scrollers.a \
        editor/libpingus_editor.a \
+       gui/libpingus_gui.a \
        components/libpingus_components.a \
        tinygettext/libpingus_tinygettext.a \
         @PINGUS_LIBS@ \
@@ -244,8 +246,6 @@
 theme.hxx \
 timer.cxx \
 timer.hxx \
-tinygettext/tinygettext.cxx \
-tinygettext/tinygettext.hxx \
 true_server.cxx \
 true_server.hxx \
 vector.cxx \

Modified: trunk/src/components/Makefile.am
===================================================================
--- trunk/src/components/Makefile.am    2005-12-02 14:35:35 UTC (rev 2531)
+++ trunk/src/components/Makefile.am    2005-12-02 16:10:04 UTC (rev 2532)
@@ -34,8 +34,6 @@
 menu_button.hxx \
 pingus_counter.cxx \
 pingus_counter.hxx \
-pingus_counter_bar.cxx \
-pingus_counter_bar.hxx \
 playfield.cxx \
 playfield.hxx \
 smallmap.cxx \


Property changes on: trunk/src/editor
___________________________________________________________________
Name: svn:ignore
   + .deps/
.sconsign


Modified: trunk/src/editor/Makefile.am
===================================================================
--- trunk/src/editor/Makefile.am        2005-12-02 14:35:35 UTC (rev 2531)
+++ trunk/src/editor/Makefile.am        2005-12-02 16:10:04 UTC (rev 2532)
@@ -24,7 +24,7 @@
 libpingus_editor_a_SOURCES =       \
 editor_screen.cxx      editor_screen.hxx       \
 editor_panel.cxx       editor_panel.hxx        \
-panel_button.cxx       panel_button.hxx        \
+panel_buttons.cxx      panel_buttons.hxx       \
 editor_viewport.cxx    editor_viewport.hxx \
 xml_level.cxx          xml_level.hxx           \
 level_objs.cxx         level_objs.hxx          \


Property changes on: trunk/src/tinygettext
___________________________________________________________________
Name: svn:ignore
   + 
.deps/
libpingus_tinygettext.a
.sconsign
semantic.cache