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

Collapse All | Expand All

(-)file_not_specified_in_diff (-12 / +18 lines)
Line  Link Here
0
-- GNUmakefile.template
0
++ GNUmakefile.template
Lines 66-72 Link Here
66
66
67
.c.o:
67
.c.o:
68
	@echo "Compiling:" $*.c
68
	@echo "Compiling:" $*.c
69
	@$(CC) $(COPTS) -c $*.c
69
	$(CC) $(COPTS) -c $*.c
70
70
71
all: time-stamp dvdisaster images 
71
all: time-stamp dvdisaster images 
72
72
Lines 79-96 Link Here
79
	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
79
	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
80
	then echo "Linking  : dvdisaster-win, dvdisaster"; \
80
	then echo "Linking  : dvdisaster-win, dvdisaster"; \
81
	     windres -v winres.rc -O coff -o winres.o >/dev/null ; \
81
	     windres -v winres.rc -O coff -o winres.o >/dev/null ; \
82
	     echo "$(CC) $(COPTS) -c dvdisaster.c"; \
82
	     $(CC) $(COPTS) -c dvdisaster.c ; \
83
	     $(CC) $(COPTS) -c dvdisaster.c ; \
84
	     echo "$(CC) $(LOPTS) $(OFILES) winres.o $(LIBS) -lole32 -mwindows -o dvdisaster-win"; \
83
	     $(CC) $(LOPTS) $(OFILES) winres.o $(LIBS) -lole32 -mwindows -o dvdisaster-win; \
85
	     $(CC) $(LOPTS) $(OFILES) winres.o $(LIBS) -lole32 -mwindows -o dvdisaster-win; \
86
	     echo "$(CC) $(COPTS) -DWIN_CONSOLE -c dvdisaster.c"; \
84
	     $(CC) $(COPTS) -DWIN_CONSOLE -c dvdisaster.c ; \
87
	     $(CC) $(COPTS) -DWIN_CONSOLE -c dvdisaster.c ; \
88
	     echo "$(CC) $(LOPTS) $(OFILES) $(LIBS) -lole32 -o dvdisaster"; \
85
	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -lole32 -o dvdisaster; \
89
	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -lole32 -o dvdisaster; \
86
	     if ! test -e signature; then dvdisaster --debug --sign; fi; \
90
	     if ! test -e signature; then dvdisaster --debug --sign; fi; \
87
	else echo "Linking  : dvdisaster"; \
91
	else echo "Linking  : dvdisaster"; \
92
	     echo "$(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster"; \
88
	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster; \
93
	     $(CC) $(LOPTS) $(OFILES) $(LIBS) -o dvdisaster; \
89
	fi
94
	fi
90
	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
95
	@if test -e locale/de/LC_MESSAGES/dvdisaster.mo \
91
	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
96
	 || echo $(WITH_OPTIONS) | grep "NLS_NO" >/dev/null; \
92
	then echo "not touching locale"; \
97
	then echo "not touching locale"; \
93
	else $(MAKE) --no-print-directory -C locale; \
98
	else echo "$(MAKE) --no-print-directory -C locale" ; $(MAKE) --no-print-directory -C locale; \
94
	fi
99
	fi
95
100
96
inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
101
inlined-icons.h: icons/read.png icons/create.png icons/scan.png icons/fix.png icons/verify.png
Lines 119-135 Link Here
119
	else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
124
	else echo "#define MODIFIED_SOURCE 1" >> help-dialogs.h; \
120
	fi
125
	fi
121
	@echo "Compiling:" $*.c
126
	@echo "Compiling:" $*.c
122
	@$(CC) $(COPTS) -c $*.c
127
	$(CC) $(COPTS) -c $*.c
123
128
124
rs-encoder-sse2.o: rs-encoder-sse2.c
129
rs-encoder-sse2.o: rs-encoder-sse2.c
125
	@echo "Compiling:" $*.c
130
	@echo "Compiling:" $*.c
126
	@$(CC) $(SSE2_OPTIONS) $(COPTS) -c $*.c
131
	$(CC) $(SSE2_OPTIONS) $(COPTS) -c $*.c
127
132
128
locale:
133
locale:
129
	@$(MAKE) --no-print-directory -C locale
134
	$(MAKE) --no-print-directory -C locale
130
135
131
simple-md5sum: md5.c
136
simple-md5sum: md5.c
132
	@$(CC) $(COPTS) -DSIMPLE_MD5SUM md5.c -o simple-md5sum
137
	$(CC) $(COPTS) -DSIMPLE_MD5SUM md5.c -o simple-md5sum
133
138
134
# Stuff needed to generate or prepare the documentation
139
# Stuff needed to generate or prepare the documentation
135
# TAG: online-docs
140
# TAG: online-docs
Lines 140-145 Link Here
140
	@if test -e THESE_ARE_THE_DEVEL_SOURCES; then \
145
	@if test -e THESE_ARE_THE_DEVEL_SOURCES; then \
141
	  echo "not touching images"; \
146
	  echo "not touching images"; \
142
        else \
147
        else \
148
	  echo "$(MAKE) --no-print-directory -C tools"; \
143
	  $(MAKE) --no-print-directory -C tools; \
149
	  $(MAKE) --no-print-directory -C tools; \
144
	  echo -n "Unpacking images (may take a while) ... "; \
150
	  echo -n "Unpacking images (may take a while) ... "; \
145
	  cd $(SRCDIR)/documentation/images; \
151
	  cd $(SRCDIR)/documentation/images; \
Lines 170-176 Link Here
170
	@echo "- done"
176
	@echo "- done"
171
177
172
tools/pngpack: tools/pngpack.c
178
tools/pngpack: tools/pngpack.c
173
	@$(MAKE) --no-print-directory -C tools
179
	$(MAKE) --no-print-directory -C tools
174
180
175
thumbnails: pack-images
181
thumbnails: pack-images
176
	@echo -n "unpacking thumbnails ... "
182
	@echo -n "unpacking thumbnails ... "
177
-- tools/Makefile.template
183
++ tools/Makefile.template
Lines 41-47 Link Here
41
41
42
.c.o:
42
.c.o:
43
	@echo "Compiling:" $*.c
43
	@echo "Compiling:" $*.c
44
	@$(CC) $(COPTS) -DPNGPACK  -c $*.c
44
	$(CC) $(COPTS) -DPNGPACK  -c $*.c
45
45
46
# Note that we build a self-contained (statically linked) pngpack.exe
46
# Note that we build a self-contained (statically linked) pngpack.exe
47
# under Windows so that we do not have to ship the .dll files for
47
# under Windows so that we do not have to ship the .dll files for
Lines 50-57 Link Here
50
pngpack: $(OFILES)
50
pngpack: $(OFILES)
51
	@echo "Linking  : pngpack";
51
	@echo "Linking  : pngpack";
52
	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
52
	@if test $(CFG_SYS_OPTIONS) == -DSYS_MINGW; \
53
	then $(CC) $(LOPTS) $(OFILES) $(LIBS) -lz --static -o pngpack; \
53
	then echo "$(CC) $(LOPTS) $(OFILES) $(LIBS) -lz --static -o pngpack" ; $(CC) $(LOPTS) $(OFILES) $(LIBS) -lz --static -o pngpack; \
54
	else $(CC) $(LOPTS) $(OFILES) $(LIBS) -o pngpack; \
54
	else echo "$(CC) $(LOPTS) $(OFILES) $(LIBS) -o pngpack" ; $(CC) $(LOPTS) $(OFILES) $(LIBS) -o pngpack; \
55
	fi
55
	fi
56
56
57
show: 
57
show: 

Return to bug 429830