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

Collapse All | Expand All

(-)src/Makefile (-24 / +35 lines)
Lines 108-113 SO = .dll Link Here
108
PIC =
108
PIC =
109
endif
109
endif
110
110
111
$(info $$NOSTRIP is [${NOSTRIP}])
111
ifdef NOSTRIP
112
ifdef NOSTRIP
112
STRIP = echo skip strip
113
STRIP = echo skip strip
113
else
114
else
Lines 127-133 MANDATORY_LIBS = `pkg-config --libs zlib || echo -lz` Link Here
127
ifndef NO_SRIPDLIB
128
ifndef NO_SRIPDLIB
128
MANDATORY_CFLAGS += -std=c++11
129
MANDATORY_CFLAGS += -std=c++11
129
endif
130
endif
130
MANDATORY_LIBS += -L$(USR)/$(LIB)
131
#MANDATORY_LIBS += -L$(USR)/$(LIB)
131
ifeq ($(notdir $(CXX)),g++)
132
ifeq ($(notdir $(CXX)),g++)
132
MANDATORY_CFLAGS += -Wall -Wextra
133
MANDATORY_CFLAGS += -Wall -Wextra
133
MANDATORY_LIBS += -lm
134
MANDATORY_LIBS += -lm
Lines 188-201 ifeq (,$(wildcard /usr/X11R6)) Link Here
188
X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
189
X11_CFLAGS = -Dcimg_display=0 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
189
X11_LIBS = -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
190
X11_LIBS = -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
190
else
191
else
191
X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
192
X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #`pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
192
X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
193
X11_LIBS = -lX11 -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
193
endif
194
endif
194
endif
195
endif
195
# Flags to enable fast display, using XShm.
196
# Flags to enable fast display, using XShm.
196
# This requires the presence of the X11 extension include and library files.
197
# This requires the presence of the X11 extension include and library files.
197
XSHM_CFLAGS = -Dcimg_use_xshm `pkg-config --cflags xcb-shm`
198
XSHM_CFLAGS = -Dcimg_use_xshm #`pkg-config --cflags xcb-shm`
198
XSHM_LIBS = `pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext`
199
XSHM_LIBS = -lXext #`pkg-config --libs xcb-shm || echo -L$(USR)/X11R6/lib -lXext`
199
200
200
# Flags to enable image display, using GDI32.
201
# Flags to enable image display, using GDI32.
201
# This requires the presence of the GDI32 include and library files (Windows only).
202
# This requires the presence of the GDI32 include and library files (Windows only).
Lines 229-236 TIFF_LIBS = `pkg-config --libs libtiff-4 || echo -ltiff` Link Here
229
230
230
# Flags to enable native support for MINC2 image files, using the MINC2 library.
231
# Flags to enable native support for MINC2 image files, using the MINC2 library.
231
# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
232
# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
232
MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
233
MINC2_CFLAGS = -Dcimg_use_minc2 #-I${HOME}/local/include
233
MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
234
MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz #-L${HOME}/local/lib
234
235
235
# Flags to enable native support for downloading files from the network.
236
# Flags to enable native support for downloading files from the network.
236
# ( http://curl.haxx.se/libcurl/ )
237
# ( http://curl.haxx.se/libcurl/ )
Lines 449-461 endif Link Here
449
450
450
libgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
451
libgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
451
	$(CXX) -o libgmic.o -c gmic.cpp $(PIC) $(CFLAGS)
452
	$(CXX) -o libgmic.o -c gmic.cpp $(PIC) $(CFLAGS)
452
libgmic: libgmic.o use_libgmic.cpp
453
libgmic: libgmic.o #use_libgmic.cpp
453
	ar rcs libgmic.a libgmic.o
454
	$(AR) rcs libgmic.a libgmic.o
454
ifeq ($(OS),Darwin)
455
ifeq ($(OS),Darwin)
455
	$(CXX) -shared -o libgmic.so libgmic.o $(LIBS)
456
	$(CXX) -shared -o libgmic.so libgmic.o $(LIBS)
456
else
457
else
457
	$(CXX) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
458
	$(CXX) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
458
	$(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS)
459
	#$(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS)
459
endif
460
endif
460
461
461
libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
462
libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
Lines 504-515 else Link Here
504
	$(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(subst -L/opt/local,-L/tmp/skl/Gimp.app/Contents/Resources,$(shell gimptool-2.0$(EXE) --libs) $(CFLAGS) $(LIBS))
505
	$(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(subst -L/opt/local,-L/tmp/skl/Gimp.app/Contents/Resources,$(shell gimptool-2.0$(EXE) --libs) $(CFLAGS) $(LIBS))
505
endif
506
endif
506
else
507
else
507
	$(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` `gimptool-2.0$(EXE) --libs` $(CFLAGS) $(LIBS)
508
	$(CXX) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) 
508
endif
509
endif
509
	$(STRIP) gmic_gimp$(EXE)
510
	$(STRIP) gmic_gimp$(EXE)
510
511
511
gmic: gmic.cpp gmic.h gmic_stdlib.h CImg.h
512
gmic: gmic.cpp gmic.h gmic_stdlib.h CImg.h
512
	$(CXX) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
513
	$(CXX) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
513
514
514
gmic_stdlib.h:
515
gmic_stdlib.h:
515
	@echo -n "> Retrieve G'MIC Standard Library..."
516
	@echo -n "> Retrieve G'MIC Standard Library..."
Lines 582-602 stdlib: Link Here
582
# Generate bash completion script (requires 'gmic' to be installed first).
583
# Generate bash completion script (requires 'gmic' to be installed first).
583
bashcompletion:
584
bashcompletion:
584
	@mkdir -p ../resources
585
	@mkdir -p ../resources
585
	@\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
586
	@./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
586
587
587
# Generate man page (requires 'gmic' to be installed).
588
# Generate man page (requires 'gmic' to be installed).
588
man:
589
man:
589
	@mkdir -p ../man
590
	@mkdir -p ../man
590
	@\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1
591
	@./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1
591
	@gzip -f ../man/gmic.1
592
	#@gzip -f ../man/gmic.1
592
593
593
# Install/uninstall/clean procedures.
594
# Install/uninstall/clean procedures.
594
install:
595
install-gimp:
595
	mkdir -p $(DESTDIR)$(PLUGINDIR)/
596
	mkdir -p $(DESTDIR)$(PLUGINDIR)/
596
	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
597
	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
597
	cp -f ../resources/gmic_film_cluts.gmz $(DESTDIR)$(PLUGINDIR)/
598
	cp -f ../resources/gmic_film_cluts.gmz $(DESTDIR)$(PLUGINDIR)/
599
600
install-bin:
598
	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
601
	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
599
	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
602
	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
603
604
install-lib:
600
	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
605
	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
601
	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
606
	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
602
	cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE)/
607
	cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE)/
Lines 610-624 ifneq ($(OS),Darwin) Link Here
610
	cp -f libcgmic.so $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1.7.4
615
	cp -f libcgmic.so $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1.7.4
611
	ln -fs libcgmic.so.1.7.4 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1
616
	ln -fs libcgmic.so.1.7.4 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1
612
	ln -fs libcgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so
617
	ln -fs libcgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libcgmic.so
613
	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
618
	#cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
614
endif
619
endif
620
621
install-man:
615
	mkdir -p $(DESTDIR)$(USR)/share/man/
622
	mkdir -p $(DESTDIR)$(USR)/share/man/
616
	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
623
	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
617
	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
624
	#mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
618
	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
625
	#cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
619
	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
626
	#cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
627
	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
628
629
install-bash:
620
	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
630
	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
621
	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
631
	#if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
622
632
623
uninstall:
633
uninstall:
624
	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
634
	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
Lines 631-638 uninstall: Link Here
631
	rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1
641
	rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.1
632
	rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic$(SO)
642
	rm -f $(DESTDIR)$(USR)/$(LIB)/libcgmic$(SO)
633
	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
643
	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
634
	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
644
	#rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
635
	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
645
	#rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
646
	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
636
647
637
distclean: clean
648
distclean: clean
638
649

Return to bug 581206