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

List:       kde-pim
Subject:    [Kde-pim] [PATCH] Integrate addressee.cpp creation in Makefile.am (was: Re: [PATCH] Bug in KABC::Add
From:       Marc Mutz <mutz () kde ! org>
Date:       2003-01-11 22:54:03
[Download RAW message or body]

On Saturday 11 January 2003 14:41, Cornelius Schumacher wrote:
> On Saturday 11 January 2003 13:28, Marc Mutz wrote:
<snip>
> > But why is addressee.{h,cpp} in CVS, then?
>
> Because nobody bothered to integrate the creation of the file into
> the build system yet.
<snip>

OK, here you go. This works for me.

Changes:
- makeaddressee:
  o search for input files in "dirname $0" instead of CWD.
  o output files to CVW instead of ".."
- Makefile.am:
  o call makeaddressee to generate addressee.{h,cpp} and field.cpp

Marc

-- 
[Norton SystemWorks 2002] Wipe Info uses hexadecimal values to wipe
files. This provides more security than wiping with decimal values.
                           -- Norton SystemWorks 2002 Manual, p.160
                              (seen on Cryptogram 12/01)

[" " (multipart/signed)]

["makeaddressee.diff" (text/x-diff)]

? makeaddressee
Index: Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kabc/Makefile.am,v
retrieving revision 1.64
diff -u -3 -p -r1.64 Makefile.am
--- Makefile.am	12 Nov 2002 12:55:49 -0000	1.64
+++ Makefile.am	11 Jan 2003 23:10:22 -0000
@@ -3,6 +3,15 @@ SUBDIRS = vcard . formats plugins
 INCLUDES = -I$(srcdir)/vcard/include -I$(srcdir)/vcard/include/generated \
   -I$(top_srcdir)/kabc -I$(top_srcdir)/kab $(all_includes)
 
+addressee.h addressee.cpp field.cpp: $(srcdir)/scripts/makeaddressee \
+				$(srcdir)/scripts/addressee.src.cpp \
+				$(srcdir)/scripts/addressee.src.h \
+				$(srcdir)/scripts/entrylist \
+				$(srcdir)/scripts/field.src.cpp
+	$(srcdir)/scripts/makeaddressee
+
+CLEANFILES = addressee.h addressee.cpp field.cpp
+
 lib_LTLIBRARIES   = libkabc.la
 libkabc_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:1 -module
 libkabc_la_LIBADD  = vcard/libvcard.la ../kdeui/libkdeui.la ../kio/libkio.la
Index: scripts/makeaddressee
===================================================================
RCS file: /home/kde/kdelibs/kabc/scripts/makeaddressee,v
retrieving revision 1.13
diff -u -3 -p -r1.13 makeaddressee
--- scripts/makeaddressee	23 Jul 2002 21:03:55 -0000	1.13
+++ scripts/makeaddressee	11 Jan 2003 23:10:23 -0000
@@ -1,7 +1,11 @@
 #!/usr/bin/perl
 
-if (!open( ENTRIES, "entrylist" ) ) {
-  print "Can't open entrylist\n";
+my $srcdir;
+$srcdir = `dirname $0` || die "Can't determine \$srcdir.";
+chomp $srcdir;
+
+if (!open( ENTRIES, "$srcdir/entrylist" ) ) {
+  print "Can't open $srcdir/entrylist\n";
   exit 1;
 }
 
@@ -20,11 +24,11 @@ if (!open( ENTRIES, "entrylist" ) ) {
 
 close ENTRIES;
 
-if (!open( H_IN, "addressee.src.h" ) ) {
-  print "Can't open addressee.src.h\n";
+if (!open( H_IN, "$srcdir/addressee.src.h" ) ) {
+  print "Can't open $srcdir/addressee.src.h\n";
   exit 1;
 }
-if (!open( H_OUT, ">../addressee.h" ) ) {
+if (!open( H_OUT, ">addressee.h" ) ) {
   print "Can't open addressee.h\n";
   exit 1;
 }
@@ -60,11 +64,11 @@ if (!open( H_OUT, ">../addressee.h" ) ) 
 close H_OUT;
 close H_IN;
 
-if (!open( CPP_IN, "addressee.src.cpp" ) ) {
-  print "Can't open addressee.src.cpp\n";
+if (!open( CPP_IN, "$srcdir/addressee.src.cpp" ) ) {
+  print "Can't open $srcdir/addressee.src.cpp\n";
   exit 1;
 }
-if (!open( CPP_OUT, ">../addressee.cpp" ) ) {
+if (!open( CPP_OUT, ">addressee.cpp" ) ) {
   print "Can't open addressee.cpp\n";
   exit 1;
 }
@@ -131,11 +135,11 @@ if (!open( CPP_OUT, ">../addressee.cpp" 
 close CPP_OUT;
 close CPP_IN;
 
-if (!open( CPP_IN, "field.src.cpp" ) ) {
-  print "Can't open field.src.cpp\n";
+if (!open( CPP_IN, "$srcdir/field.src.cpp" ) ) {
+  print "Can't open $srcdir/field.src.cpp\n";
   exit 1;
 }
-if (!open( CPP_OUT, ">../field.cpp" ) ) {
+if (!open( CPP_OUT, ">field.cpp" ) ) {
   print "Can't open field.cpp\n";
   exit 1;
 }

[Attachment #6 (application/pgp-signature)]
_______________________________________________
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]