From: Andre Noll <maan@systemlinux.org>
Date: Mon, 26 May 2008 09:24:34 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.0.2~42
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=2cfa8c8aaa4662f44bc7e7cd4d3591ed6e1326bd;p=adu.git

Merge commit 'meins/master'

Conflicts:

	Makefile
	adu.c
---

2cfa8c8aaa4662f44bc7e7cd4d3591ed6e1326bd
diff --cc Makefile
index 3cd9cc4,e039865..b590b29
--- a/Makefile
+++ b/Makefile
@@@ -1,4 -1,4 +1,4 @@@
- objects := adu.o string.o
 -objects := osl.o fd.o rbtree.o string.o adu.o sha1.o cmdline.o
++objects := adu.o string.o cmdline.o
  all: adu
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
@@@ -19,8 -19,15 +19,15 @@@ Makefile.deps: $(wildcard *.c *.h
  -include Makefile.deps
  
  adu: $(objects)
 -	$(CC) -o $@ $(objects) -lcrypto
 +	$(CC) -o $@ $(objects) -lcrypto -losl
  
+ cmdline.o: cmdline.c cmdline.h
+ 	$(CC) -c $(CPPFLAGS) $<
+ 
+ cmdline.c cmdline.h: adu.ggo
+ 	gengetopt --conf-parser < $<
+ 
+ 
  %.o: %.c Makefile
  	$(CC) -c $(CPPFLAGS) $(DEBUG_CPPFLAGS) $<
  
diff --cc adu.c
index 598919a,8068d20..9edcc58
--- a/adu.c
+++ b/adu.c
@@@ -2,9 -2,12 +2,11 @@@
  #include <dirent.h> /* readdir() */
  
  #include "gcc-compat.h"
+ #include "cmdline.h"
 -#include "osl.h"
  #include "fd.h"
 -#include "hash.h"
  #include "string.h"
  #include "error.h"
++#include "portable_io.h"
  
  DEFINE_ERRLIST;