[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/libkcal/libical/src/libicalss
From:       David Faure <faure () kde ! org>
Date:       2005-04-14 19:59:41
Message-ID: 20050414195941.812795FA () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

OK this reentrant-bison option isn't supported by all lex/yacc installations,
got renamed after some version, etc. It's a mess.
(see http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html for more)
So: generated files in CVS. Don't complain, this is the best solution.

Everyone with srcdir!=builddir: make clean first. Ensure that no .c or .h file remains in builddir.


  M +20 -13    Makefile.am   1.20
  M +1199 -419 icalsslexer.c   1.6
  M +4 -2      icalsslexer.l   1.6
  M +786 -572  icalssyacc.c   1.5
  M +27 -18    icalssyacc.h   1.4


--- kdepim/libkcal/libical/src/libicalss/Makefile.am  #1.19:1.20
@@ -6,28 +6,35 @@
 LEX_OUTPUT_ROOT = lex.ss
 
-# just to get it built
-$(srcdir)/icalgauge.c: icalssyacc.h
-icalsslexer.lo: icalssyacc.h icalgaugeimpl.h
-
-INCLUDES =                         \
-       -I$(srcdir)/..              \
-       -I..                        \
-       -I$(srcdir)/../libical      \
-       -I../libical
+INCLUDES = -I../libical -I$(srcdir)/../libical
 
 libicalss_la_SOURCES =          \
         icalcalendar.c          \
+        icalcalendar.h          \
         icalclassify.c          \
+        icalclassify.h          \
         icalcluster.c           \
+        icalcluster.h           \
+        icalclusterimpl.h       \
         icalgauge.c             \
+        icalgauge.h             \
+        icalgaugeimpl.h         \
         icaldirset.c            \
+        icaldirset.h            \
+        icaldirsetimpl.h        \
         icalfileset.c           \
+        icalfileset.h           \
+        icalfilesetimpl.h       \
         icalset.c               \
-        icalssyacc.y            \
-        icalsslexer.l           \
+        icalset.h               \
+        icalssyacc.h            \
         icalspanlist.c          \
-        icalmessage.c           
+        icalspanlist.h          \
+        icalmessage.c           \
+        icalmessage.h           \
+        icalsslexer.c           \
+        icalssyacc.c
 
-libicalss_la_COMPILE_FIRST = ../libical/ical.h
+# We don't need icalss.h, but it needs to be built...
+libicalss_la_COMPILE_FIRST = ../libical/ical.h icalss.h
 
 COMBINEDHEADERS = \

--- kdepim/libkcal/libical/src/libicalss/icalsslexer.l  #1.5:1.6
@@ -58,5 +58,7 @@ digit		[0-9]
 
 %option caseless
-/* not enough widely supported: %option reentrant-bison */
+/* See http://lists.ximian.com/archives/public/evolution-hackers/2003-September/001304.html
+   if you run into problems with this option. */
+%option reentrant-bison
 
 %s sql string_value


[prev in list] [next in list] [prev in thread] [next in thread]