1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Jens Peter Secher <jps@debian.org>
Subject: Use system-wide argument parser instead of upstream version
diff -urNad ifile-1.3.8~/Makefile.in ifile-1.3.8/Makefile.in
--- ifile-1.3.8~/Makefile.in 2006-05-22 18:49:21.000000000 +0200
+++ ifile-1.3.8/Makefile.in 2006-05-23 23:19:08.000000000 +0200
@@ -120,7 +120,7 @@
INSTALL
# Pattern rule
-ALL_CPPFLAGS = $(CPPFLAGS) $(INCLUDEFLAGS) -I$(srcdir) -I$(srcdir)/include -I$(srcdir)/argp $(DEFS)
+ALL_CPPFLAGS = $(CPPFLAGS) $(INCLUDEFLAGS) -I$(srcdir) $(DEFS)
ALL_CFLAGS = $(CFLAGS)
%.o: %.c $(LIB_H_FILES) Makefile
@@ -141,9 +141,9 @@
argp/libargp.a:
cd argp ; $(MAKE) libargp.a
-ALL_LIBS = $(LIBS) -L. -lifile -L./argp -largp -lm
+ALL_LIBS = $(LIBS) -L. -lifile -lm
-$(MAIN_EXECUTABLES): %: libifile.a argp/libargp.a %.o
+$(MAIN_EXECUTABLES): %: libifile.a %.o
$(CC) $(CFLAGS) $@.o -o $@ $(LDFLAGS) $(ALL_LIBS)
# ifile.h has macros that indicate ifile's version number; these
@@ -194,7 +194,7 @@
rm -f *.o libifile.a $(MAIN_EXECUTABLES)
cd argp ; $(MAKE) clean
maintainer-clean: clean
- rm -f config.cache config.log config.status Makefile configure
+ rm -f config.cache config.log config.status Makefile
cd argp ; $(MAKE) maintainer-clean
# Making a distribution .tar.gz file
diff -urNad ifile-1.3.8~/include/ifile.h ifile-1.3.8/include/ifile.h
--- ifile-1.3.8~/include/ifile.h 2006-05-22 18:49:21.000000000 +0200
+++ ifile-1.3.8/include/ifile.h 2006-05-23 23:19:23.000000000 +0200
@@ -30,7 +30,7 @@
#include <assert.h>
#include <string.h>
#include <stdlib.h>
-#include "argp/argp.h"
+#include <argp.h>
#include "extendable_array.h"
#include "hash_table.h"
|
