EXIV2EXE.diff

Jakub Wilk, 09 Aug 2015 14:16

Download (1.28 KB)

View differences:

src/Makefile
174 174

  
175 175
EXIV2OBJ  = $(EXIV2MAIN:.cpp=.o) $(EXIV2SRC:.cpp=.o)
176 176
EXIV2COBJ = $(EXIVCSRC:.c=.o)
177
EXIV2BIN  = $(EXIV2MAIN:.cpp=)
178 177
EXIV2EXE  = $(EXIV2MAIN:.cpp=$(EXEEXT))
179 178

  
180 179
ifdef DEP_TRACKING
......
240 239
$(LIBTOOL): $(LIBTOOL_DEPS)
241 240
	$(SHELL) $(top_srcdir)/config.status --recheck
242 241

  
243
bin: lib $(EXIV2BIN)
242
bin: lib $(EXIV2EXE)
244 243

  
245 244
lib: $(OBJ)
246 245
	$(LIBTOOL) --mode=link $(LINK.cc) -o $(LIBRARY) $(LOBJ) -rpath $(libdir) -version-info $(EXIV2_LTVERSION) $(LIBS)
......
249 248
$(BINARY): %: %.o lib
250 249
	@$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir)
251 250

  
252
$(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ)
251
$(EXIV2EXE): lib $(EXIV2OBJ) $(EXIV2COBJ)
253 252
	mkdir -pv ../bin 2>&1 > /dev/null
254 253
	@$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir)
255 254

  
......
273 272
	$(INSTALL_DIRS) $(DESTDIR)$(libdir)/pkgconfig
274 273
	$(INSTALL_DATA) $(top_srcdir)/config/exiv2.pc $(DESTDIR)$(libdir)/pkgconfig/exiv2.pc
275 274

  
276
install: $(EXIV2BIN) install-lib
275
install: $(EXIV2EXE) install-lib
277 276
	$(INSTALL_DIRS) $(DESTDIR)$(bindir)
278 277
	@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ../bin/$(EXIV2EXE) $(DESTDIR)$(bindir)/$(EXIV2EXE)
279 278
	$(INSTALL_DIRS) $(DESTDIR)$(mandir)
Redmine Appliance - Powered by TurnKey Linux