blob: 162976c6ab45bf7f29a9bf5c7f86aec01ae86c14 (
plain)
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
|
Remove hardcoded CFLAGS, fix broken example generation.
--- SDIF-3.11.4-src/configure.ac
+++ SDIF-3.11.4-src/configure.ac
@@ -518,15 +518,15 @@
[--enable-debug support additional library/programs with debug enabled],
[echo FEATURE enable-debug... $enableval;
if test "$enableval" = "yes"; then
- SELLIB=libsdif-debug.la; CFLAGS="$EXTERNAL_CFLAGS -g2 -Wall";
+ SELLIB=libsdif-debug.la;
PROGLIST="querysdif-debug\$(EXEEXT) sdifextract-debug\$(EXEEXT) sdiftotext-debug\$(EXEEXT) tosdif-debug\$(EXEEXT)";
else
- SELLIB=libsdif.la; CFLAGS="$EXTERNAL_CFLAGS -O3";
+ SELLIB=libsdif.la;
PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
fi ],
[
-SELLIB=libsdif.la; CFLAGS="$EXTERNAL_CFLAGS -O3";
+SELLIB=libsdif.la;
PROGLIST="querysdif\$(EXEEXT) sdifextract\$(EXEEXT) sdiftotext\$(EXEEXT) tosdif\$(EXEEXT)";
])
@@ -538,7 +538,7 @@
[--enable-profile generate additional library/programs with profiling output enabled],
[echo FEATURE enable-profile... $enableval;
if test "$enableval" = "yes"; then
- SELLIB=libsdif-profile.la; CFLAGS="$CFLAGS -g -pg -fprofile-arcs";
+ SELLIB=libsdif-profile.la;
PROGLIST="querysdif-profile\$(EXEEXT) sdifextract-profile\$(EXEEXT) sdiftotext-profile\$(EXEEXT) tosdif-profile\$(EXEEXT)";
dnl else use the one selected above
fi ],
--- SDIF-3.11.4-src/examples/Makefile.am
+++ SDIF-3.11.4-src/examples/Makefile.am
@@ -18,18 +18,14 @@
# trying to add source code to dist, not working yet
#
-INCLUDES = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
-CFLAGS = @CFLAGS@ '-DVERSION="$(VERSION)"'
+AM_CPPFLAGS = -I../include -I$(top_srcdir)/include -I$(top_srcdir)/sdif
+AM_CFLAGS = '-DVERSION="$(VERSION)"' @PTHREAD_CFLAGS@
-libsdif = $(top_srcdir)/sdif/.libs/libsdif.a
+bin_PROGRAMS = list-types list-nvt
-# this is for automake
-EXTRA_DIST = list-types.c list-nvt.c
+list_types_SOURCES = list-types.c
+list_types_LDADD = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-all: list-types list-nvt
+list_nvt_SOURCES = list-nvt.c
+list_nvt_LDADD = $(top_srcdir)/sdif/.libs/libsdif.a @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
-list-types: list-types.c $(libsdif)
- gcc -I../include -g -o $@ $^
-
-list-nvt: list-nvt.c $(libsdif)
- gcc $(LDFLAGS) -I../include -g -o $@ $^
|
GitWeb
