Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 350240 | Differences between
and this patch

Collapse All | Expand All

(-)hbci4java-2.5.12-src/chipcard/src/frontend/Makefile (-5 / +6 lines)
Lines 4-11 INCLUDES = -I../include -I$(JAVA_HOME)/i Link Here
4
WARNINGS = -Wall
4
WARNINGS = -Wall
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
6
6
7
CC       = g++
7
CXX      ?= g++
8
CFLAGS   = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
8
AR       ?= ar
9
CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
9
LIBS     = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel
10
LIBS     = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel
10
11
11
SOURCES = frontend.cpp
12
SOURCES = frontend.cpp
Lines 15-30 OBJECTS = ../../bin/frontend.o Link Here
15
.SUFFIXES: .cpp .o
16
.SUFFIXES: .cpp .o
16
17
17
../../bin/%.o: %.cpp
18
../../bin/%.o: %.cpp
18
	$(CC) -c -o $@ $(CFLAGS) $<
19
	$(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
19
20
20
all: depend ../../bin/libhbci4java-card-linux.so
21
all: depend ../../bin/libhbci4java-card-linux.so
21
22
22
depend: Makefile.depend
23
depend: Makefile.depend
23
24
24
Makefile.depend: $(SOURCES)
25
Makefile.depend: $(SOURCES)
25
	for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
26
	for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
26
27
27
../../bin/libhbci4java-card-linux.so: $(OBJECTS) ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
28
../../bin/libhbci4java-card-linux.so: $(OBJECTS) ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
28
	$(CC) -fPIC -shared -o $@ $(OBJECTS) $(LIBS) 
29
	$(CXX) $(LDFLAGS) -fPIC -shared -o $@ $(OBJECTS) $(LIBS) 
29
30
30
include Makefile.depend
31
include Makefile.depend
(-)hbci4java-2.5.12-src/chipcard/src/highlevel/Makefile (-5 / +5 lines)
Lines 4-12 INCLUDES = -I../include Link Here
4
WARNINGS = -Wall
4
WARNINGS = -Wall
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
6
6
7
CC       = g++
7
CXX       ?= g++
8
AR       = ar
8
AR        ?= ar
9
CFLAGS   = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
9
CXXFLAGS  += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
10
10
11
SOURCES = hbci_cardtype.cpp \
11
SOURCES = hbci_cardtype.cpp \
12
          ddv_decrypt.cpp \
12
          ddv_decrypt.cpp \
Lines 37-50 OBJECTS = ../../bin/hbci_cardtype.o \ Link Here
37
.SUFFIXES: .cpp .o
37
.SUFFIXES: .cpp .o
38
38
39
../../bin/%.o: %.cpp
39
../../bin/%.o: %.cpp
40
	$(CC) -c -o $@ $(CFLAGS) $<
40
	$(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
41
41
42
all: depend ../../bin/libzkachip-highlevel.a
42
all: depend ../../bin/libzkachip-highlevel.a
43
43
44
depend: Makefile.depend
44
depend: Makefile.depend
45
45
46
Makefile.depend: $(SOURCES)
46
Makefile.depend: $(SOURCES)
47
	for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
47
	for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
48
48
49
../../bin/libzkachip-highlevel.a: $(OBJECTS)
49
../../bin/libzkachip-highlevel.a: $(OBJECTS)
50
	$(AR) rcsv $@ $(OBJECTS)
50
	$(AR) rcsv $@ $(OBJECTS)
(-)hbci4java-2.5.12-src/chipcard/src/lowlevel/Makefile (-5 / +5 lines)
Lines 4-12 INCLUDES = -I../include Link Here
4
WARNINGS = -Wall
4
WARNINGS = -Wall
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
6
6
7
CC       = g++
7
CXX      ?= g++
8
AR       = ar
8
AR       ?= ar
9
CFLAGS   = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
9
CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
10
10
11
SOURCES = atr.cpp \
11
SOURCES = atr.cpp \
12
          bcs.cpp \
12
          bcs.cpp \
Lines 41-54 OBJECTS = ../../bin/atr.o \ Link Here
41
.SUFFIXES: .cpp .o
41
.SUFFIXES: .cpp .o
42
42
43
../../bin/%.o: %.cpp
43
../../bin/%.o: %.cpp
44
	$(CC) -c -o $@ $(CFLAGS) $<
44
	$(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
45
45
46
all: depend ../../bin/libzkachip-lowlevel.a
46
all: depend ../../bin/libzkachip-lowlevel.a
47
47
48
depend: Makefile.depend
48
depend: Makefile.depend
49
49
50
Makefile.depend: $(SOURCES)
50
Makefile.depend: $(SOURCES)
51
	for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
51
	for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
52
52
53
../../bin/libzkachip-lowlevel.a: $(OBJECTS)
53
../../bin/libzkachip-lowlevel.a: $(OBJECTS)
54
	$(AR) rcsv $@ $(OBJECTS)
54
	$(AR) rcsv $@ $(OBJECTS)
(-)hbci4java-2.5.12-src/chipcard/src/tools/Makefile (-5 / +6 lines)
Lines 4-11 INCLUDES = -I../include Link Here
4
WARNINGS = -Wall
4
WARNINGS = -Wall
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
5
# removed "-Werror -pedantic" because of dlsym() typecast problem
6
6
7
CC       = g++
7
CXX      ?= g++
8
CFLAGS   = -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
8
AR       ?= ar
9
CXXFLAGS += -fPIC $(DEFINES) $(INCLUDES) $(WARNINGS)
9
LIBS	 = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel -ldl
10
LIBS	 = -L../../bin -lzkachip-highlevel -lzkachip-lowlevel -ldl
10
11
11
SOURCES = t_hbci_cardinfo.cpp \
12
SOURCES = t_hbci_cardinfo.cpp \
Lines 29-43 PROGRAMS = ../../bin/t_hbci_cardinfo \ Link Here
29
.SUFFIXES: .cpp .o
30
.SUFFIXES: .cpp .o
30
31
31
../../bin/%.o: %.cpp
32
../../bin/%.o: %.cpp
32
	$(CC) -c -o $@ $(CFLAGS) $<
33
	$(CXX) -c -o $@ $(CXXFLAGS) $(LDFLAGS) $<
33
../../bin/%: ../../bin/%.o ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
34
../../bin/%: ../../bin/%.o ../../bin/libzkachip-highlevel.a ../../bin/libzkachip-lowlevel.a
34
	$(CC) -fPIC -o $@ $< $(LIBS)
35
	$(CXX) -fPIC -o $@ $< $(LIBS)
35
36
36
all: depend $(PROGRAMS)
37
all: depend $(PROGRAMS)
37
38
38
depend: Makefile.depend
39
depend: Makefile.depend
39
40
40
Makefile.depend: $(SOURCES)
41
Makefile.depend: $(SOURCES)
41
	for file in $(SOURCES); do echo -n "../../bin/"; gcc $(CFLAGS) -MM $$file; done >Makefile.depend
42
	for file in $(SOURCES); do echo -n "../../bin/"; $(CXX) $(CXXFLAGS) $(LDFLAGS) -MM $$file; done >Makefile.depend
42
43
43
include Makefile.depend
44
include Makefile.depend

Return to bug 350240