Compare commits

..

3 Commits

Author SHA1 Message Date
le vieux
0481c39c5e Merge branch 'master' of ssh://tetalab.org:2213/tTh/FloatImg into master
First trial with Fedora
2020-11-08 20:43:13 +01:00
le vieux
e5236e0e3e patched Makefile for Fedora 2020-11-08 20:42:27 +01:00
le vieux
7e7b878b30 omg, another potential bug killed 2020-11-08 20:40:30 +01:00
2 changed files with 10 additions and 6 deletions

View File

@ -2,6 +2,7 @@
COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=0 COPT = -Wall -fpic -g -no-pie -DDEBUG_LEVEL=0
DEPS = ../floatimg.h Makefile DEPS = ../floatimg.h Makefile
OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \ OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \
fimg-libpnm.o rampes.o sfx0.o geometry.o rotate.o \ fimg-libpnm.o rampes.o sfx0.o geometry.o rotate.o \
equalize.o fimg-fits.o saturation.o histogram.o \ equalize.o fimg-fits.o saturation.o histogram.o \
@ -11,9 +12,12 @@ OBJS = fimg-png.o fimg-tiff.o misc-plots.o filtrage.o utils.o \
#--------------------------------------------------------------- #---------------------------------------------------------------
t: t.c $(DEPS) ../libfloatimg.a t: t.c $(DEPS) ../libfloatimg.a
gcc $(COPT) $< ../libfloatimg.a -lnetpbm -lpnglite -lcfitsio \ gcc $(COPT) $< \
-ltiff \ -I/usr/include/netpbm/ \
-lz -lm -o $@ -I/usr/include/cfitsio/ \
../libfloatimg.a -lnetpbm -lpnglite -lcfitsio \
-ltiff \
-lz -lm -o $@
#--------------------------------------------------------------- #---------------------------------------------------------------
@ -30,10 +34,10 @@ fimg-tiff.o: fimg-tiff.c $(DEPS)
gcc $(COPT) -c $< gcc $(COPT) -c $<
fimg-fits.o: fimg-fits.c $(DEPS) fimg-fits.o: fimg-fits.c $(DEPS)
gcc $(COPT) -c $< gcc $(COPT) -I/usr/include/cfitsio/ -c $<
fimg-libpnm.o: fimg-libpnm.c $(DEPS) fimg-libpnm.o: fimg-libpnm.c $(DEPS)
gcc $(COPT) -c $< gcc $(COPT) -I/usr/include/netpbm -c $<
misc-plots.o: misc-plots.c $(DEPS) misc-plots.o: misc-plots.c $(DEPS)
gcc $(COPT) -c $< gcc $(COPT) -c $<

View File

@ -9,7 +9,7 @@
#include "../floatimg.h" #include "../floatimg.h"
int verbosity; extern int verbosity;
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* nouveau 7 octobre 2020, juste avant sonoptic de la pluie craignos */ /* nouveau 7 octobre 2020, juste avant sonoptic de la pluie craignos */