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

List:       kde-pim
Subject:    Re: [Kde-pim] Compile problems in kdepim CVS HEAD
From:       Adriaan de Groot <adridg () cs ! kun ! nl>
Date:       2002-09-23 8:50:27
[Download RAW message or body]

Two different patches against the Makefile.am attached. First off, it seems 
that the Makefile.am has _never_ been good at creating parseholidy.h, since 
the yacc commands always both had -d -o parseholiday.c. Weird.

The first patch (pim-patch1) just makes a bunch of source files depend on the 
phony target parser, and takes dirk's parser target to create them. Note that 
this _still_ doesn't create parseholiday.h. Change one more line in 
Makefile.am to fix that. However, it matches what Dirk was doing, and 
presumably he knows why he changed this in the first place.

The other patch (pim-patch2) is one I prefer, since it adds dependency 
information explicitly again to the Makefile and problably has better support 
for builddir != srcdir as well.

Please give one or the other a try and let me know.

-- 
A little axiom goes a long way.
["pim.patch1" (text/x-diff)]

Index: Makefile.am
===================================================================
RCS file: /home/kde/kdepim/korganizer/plugins/holidays/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	2002/09/18 15:15:31	1.3
+++ Makefile.am	2002/09/23 08:41:20
@@ -8,7 +8,8 @@
 
 kde_module_LTLIBRARIES = libkorg_holidays.la
 
-libkorg_holidays_la_SOURCES = holidays.cpp configdialog.cpp scanholiday.c parseholiday.c
+libkorg_holidays_la_SOURCES = scanholiday.c parseholiday.c \
+	holidays.cpp configdialog.cpp
 
 libkorg_holidays_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
 libkorg_holidays_la_LIBADD = $(LIB_KDEUI)
@@ -17,6 +18,10 @@
 
 servicedir  = $(kde_servicesdir)/korganizer
 service_DATA = holidays.desktop
+
+.PHONY : parser
+
+scanholiday.c parseholidy.c parseholiday.h : parser
 
 parser:
 	cd $(srcdir) && $(YACC) -p kcal -d -o parseholiday.c parseholiday.y

["pim.patch2" (text/x-diff)]

Index: Makefile.am
===================================================================
RCS file: /home/kde/kdepim/korganizer/plugins/holidays/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	2002/09/18 15:15:31	1.3
+++ Makefile.am	2002/09/23 08:48:04
@@ -8,7 +8,8 @@
 
 kde_module_LTLIBRARIES = libkorg_holidays.la
 
-libkorg_holidays_la_SOURCES = holidays.cpp configdialog.cpp scanholiday.c parseholiday.c
+libkorg_holidays_la_SOURCES = scanholiday.c parseholiday.c \
+	holidays.cpp configdialog.cpp
 
 libkorg_holidays_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) 
 libkorg_holidays_la_LIBADD = $(LIB_KDEUI)
@@ -18,7 +19,11 @@
 servicedir  = $(kde_servicesdir)/korganizer
 service_DATA = holidays.desktop
 
-parser:
-	cd $(srcdir) && $(YACC) -p kcal -d -o parseholiday.c parseholiday.y
-	cd $(srcdir) && $(YACC) -p kcal -d -o parseholiday.c parseholiday.y
-	cd $(srcdir) && $(LEX) -Pkcal -B -oscanholiday.c scanholiday.lex
+scanholiday.c : scanholiday.lex
+	$(LEX) -Pkcal -B -oscanholiday.c $(srcdir)/scanholiday.lex
+
+parseholiday.c : parseholiday.y parseholiday.h
+	$(YACC) -p kcal -o parseholiday.c $(srcdir)/parseholiday.y
+
+parseholiday.h : parseholiday.y
+	$(YACC) -p kcal -d -o parseholiday.h $(srcdir)/parseholiday.y

_______________________________________________
kde-pim mailing list
kde-pim@mail.kde.org
http://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

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