File: 0001-No-snaphu-and-epr-api.patch

package info (click to toggle)
gmtsar 6.6%2Bds-1
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 17,084 kB
  • sloc: ansic: 36,645; csh: 10,831; sh: 3,454; python: 3,127; xml: 1,764; makefile: 1,100; perl: 725
file content (129 lines) | stat: -rw-r--r-- 4,690 bytes parent folder | download
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
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
From: Antonio Valentino <antonio.valentino@tiscali.it>
Date: Fri, 10 May 2024 17:15:21 +0000
Subject: No snaphu and epr-api

Forwarded: not-needed
---
 Makefile                                           |  2 +-
 preproc/ENVI_preproc/ENVI_SLC_decode/Makefile      | 33 ++++------------------
 .../ENVI_preproc/ENVI_SLC_decode/envi_slc_decode.c |  2 +-
 .../ENVI_SLC_decode/envisat_dump_data.c            |  2 +-
 .../ENVI_SLC_decode/envisat_dump_header.c          |  2 +-
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/Makefile b/Makefile
index c10054e..bf679dd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ sinclude config.mk
 #
 PREPROCESSORS	= ALOS ERS S1A CSK TSX RS2 ENVI GF3 NSR LT1 
 #
-DIRS		= gmtsar snaphu/src
+DIRS		= gmtsar
 ORBITS_URL	= http://topex.ucsd.edu/gmtsar/tar/ORBITS.tar
 ORBITS		= ORBITS.tar
 
diff --git a/preproc/ENVI_preproc/ENVI_SLC_decode/Makefile b/preproc/ENVI_preproc/ENVI_SLC_decode/Makefile
index ca78142..4fc08f0 100755
--- a/preproc/ENVI_preproc/ENVI_SLC_decode/Makefile
+++ b/preproc/ENVI_preproc/ENVI_SLC_decode/Makefile
@@ -5,31 +5,9 @@ CSRCS = envi_slc_decode.c
 
 OBJS =  $(CSRCS:.c=.o)
 INCLUDES = -I../../../gmtsar -I../../S1A_preproc/include -I$(TIFF_INC)
-CLIBS = -L../../../gmtsar -lgmtsar -L../lib -lENVI -L../../S1A_preproc/lib  -lxmlC -lm
+CLIBS = -L../../../gmtsar -lgmtsar -L../lib -lENVI -L../../S1A_preproc/lib -lepr_api -lxmlC -lm
 
-LIB_SRC =       epr_api-2.3/src/epr_api.c \
-                epr_api-2.3/src/epr_band.c \
-                epr_api-2.3/src/epr_bitmask.c \
-                epr_api-2.3/src/epr_core.c \
-                epr_api-2.3/src/epr_dataset.c \
-                epr_api-2.3/src/epr_dddb.c \
-                epr_api-2.3/src/epr_dsd.c \
-                epr_api-2.3/src/epr_dump.c \
-                epr_api-2.3/src/epr_field.c \
-                epr_api-2.3/src/epr_msph.c \
-                epr_api-2.3/src/epr_param.c \
-                epr_api-2.3/src/epr_product.c \
-                epr_api-2.3/src/epr_ptrarray.c \
-                epr_api-2.3/src/epr_record.c \
-                epr_api-2.3/src/epr_string.c \
-                epr_api-2.3/src/epr_swap.c \
-                epr_api-2.3/src/epr_typconv.c
-
-
-all:	epr envi_slc_decode envisat_dump_data envisat_dump_header
-
-epr:		$(LIB_SRC)
-	(cd epr_api-2.3/src/; make)
+all:	envi_slc_decode envisat_dump_data envisat_dump_header
 
 install:
 	$(INSTALL) $(PROG) $(bindir)
@@ -43,22 +21,21 @@ uninstall:
 
 clean:
 	rm -f $(OBJS) envi_slc_decode envisat_dump_data envisat_dump_header tags core
-	(cd epr_api-2.3/src/; make clean)
 
 envi_slc_decode:
 		$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
 		-o envi_slc_decode \
 		envi_slc_decode.c \
-		epr_api-2.3/src/*.o $(CLIBS)
+		$(CLIBS)
 
 envisat_dump_data:
 		$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
 		-o envisat_dump_data \
 		envisat_dump_data.c \
-		epr_api-2.3/src/*.o $(CLIBS)
+		$(CLIBS)
 
 envisat_dump_header:
 		$(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(LDFLAGS) \
 		-o envisat_dump_header \
 		envisat_dump_header.c \
-		epr_api-2.3/src/*.o $(CLIBS)
+		$(CLIBS)
diff --git a/preproc/ENVI_preproc/ENVI_SLC_decode/envi_slc_decode.c b/preproc/ENVI_preproc/ENVI_SLC_decode/envi_slc_decode.c
index a6fb03c..0263c96 100644
--- a/preproc/ENVI_preproc/ENVI_SLC_decode/envi_slc_decode.c
+++ b/preproc/ENVI_preproc/ENVI_SLC_decode/envi_slc_decode.c
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "PRM.h"
-#include "epr_api-2.3/src/epr_api.h"
+#include "epr_api.h"
 #include "lib_defs.h"
 #include "lib_functions.h"
 #include "stateV.h"
diff --git a/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_data.c b/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_data.c
index b8ed88e..32a5fd3 100644
--- a/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_data.c
+++ b/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_data.c
@@ -4,7 +4,7 @@
    17-April-1017
    $Id: envisat_dump_data.c,v 1.5 2004/08/09 09:43:28 kampes Exp $
 */
-#include "epr_api-2.3/src/epr_api.h"
+#include "epr_api.h"
 #include <assert.h>
 #include <errno.h>
 #include <math.h>
diff --git a/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_header.c b/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_header.c
index 1c1aeef..178f5da 100644
--- a/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_header.c
+++ b/preproc/ENVI_preproc/ENVI_SLC_decode/envisat_dump_header.c
@@ -4,7 +4,7 @@
 *   convert this to doris input
     $Id: envisat_dump_header.c,v 1.4 2004/05/13 18:13:39 kampes Exp $
 */
-#include "epr_api-2.3/src/epr_api.h"
+#include "epr_api.h"
 #include <assert.h>
 #include <errno.h>
 #include <math.h>