Changeset 127

Timestamp:

05/16/05 17:17:07

Author:

ben

Message:

Better behaviour:
a) Say where make is happening
b) configure.h lives in include
c) Makefiles work standalone
d) configure can (must) be run from top directory

Files:

• openpgpsdk/trunk/Makefile (modified) (1 diff)
• openpgpsdk/trunk/configure (modified) (3 diffs)
• openpgpsdk/trunk/examples/Makefile.template (modified) (2 diffs)
• openpgpsdk/trunk/examples/configure.h.template (deleted)
• openpgpsdk/trunk/include/configure.h.template (moved) (moved from openpgpsdk/trunk/src/configure.h.template)
• openpgpsdk/trunk/ref/draft-ietf-openpgp-rfc2440bis-12-comments.txt (modified) (1 diff)
• openpgpsdk/trunk/src/Makefile.template (modified) (1 diff)

openpgpsdk/trunk/Makefile

@@ -7 +7 @@
-SUBDIRS=src examples
-
-
+
-
-
-
-
+
-        @for d in $(SUBDIRS); do \
-make CONFIGURE=$(CONFIGURE) Makefile
+echo "+++ make in $$d"; make; echo "--- $$d"
-        done
-
-
-
-
-
+
+
-
-force_depend:
-        @for d in $(SUBDIRS); do \
-make force_depend
+echo "+++ make force_depend in $$d"; make force_depend ; echo "--- $$d"
-        done
-
-clean:
-        @for d in $(SUBDIRS); do \
-make clean
+echo "+++ make clean in $$d"; make clean; echo "--- $$d"
-        done
-

openpgpsdk/trunk/configure

@@ -50 +50 @@
-fixSubst();
-
-open(D,'>.depend') || croak "Can't create .depend"
-lose D
+create('src/.depend')
+reate('examples/.depend')
-
-
-
+
+
+
-
+print "make clean\n";
-system 'make clean' || exit;
+print "make force_depend\n";
-system 'make force_depend' || exit;
-
@@ -120 +123 @@
-
-    open(T,"$file.template") || croak "Can't open $file.template: $!";
+    unlink $file;
-    open(M,">$file") || croak "Can't create $file: $!";
-
@@ -139 +143 @@
-    }
-}
+
+sub create {
+    my $file=shift;
+
+    print "Creating $file\n";
+    open(D,">$file") || croak "Can't create $file";
+    close D;
+}
+

openpgpsdk/trunk/examples/Makefile.template

@@ -5 +5 @@
-CFLAGS=-Wall -Werror -g $(DM_FLAGS) -I../include  %INCLUDES%
-LDFLAGS=-g
-
+
+
-
-all: Makefile .depend packet-dump 
-
-../src/libops.a
+$(LIBDEPS)
-        $(CC) $(LDFLAGS) -o packet-dump packet-dump.o $(LIBS)
-
@@ -26 +27 @@
-        $(CC) $(CFLAGS) -E -MM *.c > .depend
-
-$(CONFIGURE)
+../configure
-        echo Makefile is older than templates, rerun configure.
-        exit 1

openpgpsdk/trunk/ref/draft-ietf-openpgp-rfc2440bis-12-comments.txt

@@ -38 +38 @@
-"The concatenation of the data to be signed, the signature type and
-creation time from the signature packet (5 additional octets) is hashed."
+
+In 5.9:
+
+   " - File name as a string (one-octet length, followed by file name),
+       if the encrypted data should be saved as a file."
+
+but no mention of what if it shouldn't be saved as a file. 0 length,
+perhaps?
+
+Then:
+
+   " - A four-octet number that indicates the modification date of the
+       file, or the creation time of the packet, or a zero that
+       indicates the present time."
+
+I would _guess_ that it means modification date of the file if there's
+a filename, the creation time if there isn't. I have no idea what zero
+is supposed to mean. Nothing, would be the obvious interpretation -
+"the present time" is nonsensical.
+
+Once more, when I know what its supposed to mean, I'll suggest
+wording.
+

openpgpsdk/trunk/src/Makefile.template

@@ -36 +36 @@
-        $(CC) $(CFLAGS) -E -MM *.c > .depend
-
-$(CONFIGURE)
+../configure
-        echo Makefile is older than templates, rerun configure.
-        exit 1