X-Git-Url: https://git.octo.it/?a=blobdiff_plain;ds=sidebyside;f=Jamrules;h=4dfca553b469efc8c0d9183111ebd8a608a42eac;hb=d8aaa588d7a774d8eb81861367f84b1a34512457;hp=b07ecd4b9ca36a7df8c81597fce3c1c1ddc2ea1e;hpb=810053f3d4fbacb77f22bb4c2c60f5615ad5ec36;p=supertux.git

diff --git a/Jamrules b/Jamrules
index b07ecd4b9..4dfca553b 100644
--- a/Jamrules
+++ b/Jamrules
@@ -4,6 +4,9 @@ if ! $(top_builddir)
 }
 top_srcdir = $(TOP) ;
 
+# unset some stuff defined in Jambase
+LEX = ;
+
 JAMCONFIG ?= $(top_builddir)/Jamconfig ;
 include $(JAMCONFIG) ;
 if ! $(JAMCONFIG_READ)
@@ -13,22 +16,28 @@ if ! $(JAMCONFIG_READ)
 
 if $(USE_STLPORT_DEBUG)
 {
-  CPPFLAGS += -I/usr/include/stlport ;
-  CPPFLAGS += -D_STLP_DEBUG=1 -D_STLP_DEBUG_UNINITIALIZED=1 ;
-  CPPFLAGS += -D_STLP_SHRED_BYTE=0xA3 ;
+  CXXFLAGS += -I/usr/include/stlport ;
+  CXXFLAGS += -D_STLP_DEBUG=1 -D_STLP_DEBUG_UNINITIALIZED=1 ;
+  CXXFLAGS += -D_STLP_SHRED_BYTE=0xA3 ;
   LIBS += -lstlport_gcc_debug ;
 }
 
-COMPILER_CFLAGS += -Wall -W ;
-COMPILER_CFLAGS_optimize += -O3 -g3 ;
-COMPILER_C++FLAGS_optimize += -O3 -g3 ;
-COMPILER_LFLAGS_optimize += -O3 -g3 ;
-COMPILER_CFLAGS_debug += -DDEBUG -Werror -g3 ;
-COMPILER_CXXFLAGS_debug += -DDEBUG -Werror -g3 ;
-COMPILER_LFLAGS_debug += -g3 ;
-COMPILER_CFLAGS_profile += -O2 -g3 -pg ;
-COMPILER_CXXFLAGS_profile += -O2 -g3 -pg ;
-COMPILER_LFLAGS_profile += -g3 -pg ;
+switch $(VARIANT) {
+    case optimize :
+        CFLAGS += -Wall -O3 -g ;
+        CXXFLAGS += -Wall -O3 -g ;
+        LIBS += -g ;
+    case debug :
+        CFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
+        CXXFLAGS += -Wall -W -Werror -O0 -g3 -DDEBUG ;
+        LIBS += -g3 ;
+    case profile :
+        CFLAGS += -Wall -W -O3 -g3 -pg ;
+        CXXFLAGS += -Wall -W -O3 -g3 -pg ;
+        LIBS += -g3 -pg ;
+    case * :
+        EXIT "Invalid variant $(VARIANT) selected" ;
+}
 
 LINK = $(CXX) ;
 
@@ -37,19 +46,35 @@ include $(TOP)/mk/jam/build.jam ;
 
 # Include Dirs
 IncludeDir $(top_builddir) ; # for config.h
-IncludeDir lib src ;
+IncludeDir $(top_srcdir)/src ;
+
+actions quietly Append
+{
+  echo $(>) >> $(<) ;
+}
+
+rule DumpVar
+{
+  for FILE in $(>)
+  {
+    Append $(<) : $(FILE) ;
+  }
+  Depends $(<) : $(>) ;
+}
 
 if $(XGETTEXT) != ""
 {
     actions XGetText
     {
-        $(XGETTEXT) $(XGETTEXT_FLAGS) --keyword='_:1' -o $(<) $(>)
+        $(XGETTEXT) $(XGETTEXT_FLAGS) -o $(<) -f $(>)
     }
     rule MakePot
     {
       if $(>) {
-        XGetText $(<) : $(>) ;
-        Depends $(<) : $(>) ;
+        DumpVar $(<).in : $(>) ;
+        XGetText $(<) : $(<).in ;
+        RmTemps $(<) : $(<).in ;
+        Depends $(<) : $(<).in ;
         Depends all : $(<) ;
       }
     }
@@ -57,4 +82,3 @@ if $(XGETTEXT) != ""
     rule MakePot
     { }
 }
-