|
Lines 1-5
Link Here
|
| 1 |
--- gmic-1.6.5.1/src/Makefile |
1 |
--- gmic-1.6.6.1/src/Makefile |
| 2 |
+++ gmic-1.6.5.1/src/Makefile |
2 |
+++ gmic-1.6.6.1/src/Makefile |
| 3 |
@@ -85,7 +85,6 @@ |
3 |
@@ -93,7 +93,6 @@ |
| 4 |
ifndef NO_STDLIB |
4 |
ifndef NO_SRIPDLIB |
| 5 |
MANDATORY_CFLAGS += -std=c++11 |
5 |
MANDATORY_CFLAGS += -std=c++11 |
|
Lines 10-12
Link Here
|
| 10 |
MANDATORY_LIBS += -lm |
10 |
MANDATORY_LIBS += -lm |
| 11 |
@@ -138,13 +137,13 @@ |
11 |
@@ -146,13 +145,13 @@ |
| 12 |
# Flags to enable image display, using X11 |
12 |
# Flags to enable image display, using X11 |
|
Lines 27-29
Link Here
|
| 27 |
# This requires the presence of the GDI32 include and library files. |
27 |
# This requires the presence of the GDI32 include and library files. |
| 28 |
@@ -168,8 +167,8 @@ |
28 |
@@ -176,8 +175,8 @@ |
| 29 |
|
29 |
|
|
Lines 38-40
Link Here
|
| 38 |
# ( http://curl.haxx.se/libcurl/ ) |
38 |
# ( http://curl.haxx.se/libcurl/ ) |
| 39 |
@@ -308,7 +307,6 @@ |
39 |
@@ -316,7 +315,6 @@ |
| 40 |
|
40 |
|
|
Lines 42-44
Link Here
|
| 42 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
42 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
| 43 |
- strip gmic$(EXE) |
43 |
- $(STRIP) gmic$(EXE) |
| 44 |
|
44 |
|
|
Lines 46-48
Link Here
|
| 46 |
$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp |
46 |
$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp |
| 47 |
@@ -318,11 +316,9 @@ |
47 |
@@ -326,11 +324,9 @@ |
| 48 |
|
48 |
|
|
Lines 50-52
Link Here
|
| 50 |
$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic |
50 |
$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic |
| 51 |
- strip gmic$(EXE) |
51 |
- $(STRIP) gmic$(EXE) |
| 52 |
|
52 |
|
|
Lines 54-56
Link Here
|
| 54 |
$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic |
54 |
$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic |
| 55 |
- strip gmic$(EXE) |
55 |
- $(STRIP) gmic$(EXE) |
| 56 |
|
56 |
|
|
Lines 58-61
Link Here
|
| 58 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
58 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
| 59 |
@@ -338,24 +334,22 @@ |
59 |
@@ -346,24 +342,22 @@ |
| 60 |
libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h |
60 |
libgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h |
| 61 |
$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS) |
61 |
$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS) |
|
Lines 75-85
Link Here
|
| 75 |
|
75 |
|
| 76 |
gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h |
76 |
gmic_gimp.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h |
| 77 |
$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS) |
77 |
$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS) |
| 78 |
|
78 |
|
| 79 |
gmic_gimp : gmic_gimp.o gmic_gimp.cpp |
79 |
gmic_gimp: gmic_gimp.o gmic_gimp.cpp |
| 80 |
- $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
80 |
- $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
| 81 |
- strip gmic_gimp$(EXE) |
81 |
- $(STRIP) gmic_gimp$(EXE) |
| 82 |
+ $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
82 |
+ $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
| 83 |
|
83 |
|
| 84 |
gmic: gmic.cpp gmic.h gmic_def.h CImg.h |
84 |
gmic: gmic.cpp gmic.h gmic_stdlib.h CImg.h |
| 85 |
- $(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS) |
85 |
- $(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS) |
|
Lines 87-91
Link Here
|
| 87 |
|
87 |
|
| 88 |
gmic_def.h: |
88 |
gmic_stdlib.h: |
| 89 |
@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h |
89 |
@echo "> Retrieve G'MIC Standard Library...\r" |
| 90 |
@@ -380,38 +374,43 @@ |
90 |
@@ -436,38 +430,43 @@ |
| 91 |
# Generate bash completion script (requires 'gmic' to be installed first). |
91 |
# Generate bash completion script (requires 'gmic' to be installed first). |
|
Lines 93-96
Link Here
|
| 93 |
@mkdir -p ../resources |
93 |
@mkdir -p ../resources |
| 94 |
- @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
94 |
- @\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
| 95 |
+ @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
95 |
+ @./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
| 96 |
|
96 |
|
|
Lines 99-103
Link Here
|
| 99 |
@mkdir -p ../man |
99 |
@mkdir -p ../man |
| 100 |
- @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1 |
100 |
- @\gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1 |
| 101 |
- @gzip -f ../man/gmic.1 |
101 |
- @gzip -f ../man/gmic.1 |
| 102 |
+ @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1 |
102 |
+ @./gmic -v - gmic_stdlib.gmic raw:gmic_stdlib.gmic,uchar -__help man 2> ../man/gmic.1 |
| 103 |
|
103 |
|
|
Lines 120-123
Link Here
|
| 120 |
mkdir -p $(DESTDIR)$(USR)/$(LIB) |
120 |
mkdir -p $(DESTDIR)$(USR)/$(LIB) |
| 121 |
cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5 |
121 |
cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.6 |
| 122 |
ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
122 |
ln -fs libgmic.so.1.6.6 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
| 123 |
ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so |
123 |
ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so |
|
Lines 143-145
Link Here
|
| 143 |
rm -f $(DESTDIR)$(USR)/$(BIN)/gmic |
143 |
rm -f $(DESTDIR)$(USR)/$(BIN)/gmic |
| 144 |
@@ -421,8 +420,7 @@ |
144 |
@@ -477,8 +476,7 @@ |
| 145 |
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
145 |
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
