Minor style modifications to comply with c99 compiler flag; removed Microsoft-specifi...

[openjpeg.git] / jpwl / Makefile

diff --git a/jpwl/Makefile b/jpwl/Makefile
index 4c4bb1053922fd35a1e094a18958eee8ca87f381..9dce884a525f2d4993ae053c98b090f800378eda 100755 (executable)
--- a/jpwl/Makefile
+++ b/jpwl/Makefile
@@ -19,8 +19,8 @@ INSTALL_INCLUDE = $(PREFIX)/include
 # Converts cr/lf to just lf\r
 DOS2UNIX = dos2unix\r
 \r
-COMPILERFLAGS = -O3 -fPIC\r
-LIBRARIES = -lstdc++\r
+COMPILERFLAGS = -Wall -O3 -ffast-math -std=c99 -fPIC
+LIBRARIES = -lstdc++
 \r
 MODULES = $(SRCS:.c=.o)\r
 CFLAGS = $(COMPILERFLAGS) $(INCLUDE) -DUSE_JPWL\r
@@ -60,10 +60,10 @@ $(SHAREDLIB): $(MODULES)
        $(CC) -s -shared -Wl,-soname,$(LIBNAME) -o $@ $(MODULES) $(LIBRARIES)\r
 \r
 JPWL_j2k_to_image: ../codec/j2k_to_image.c\r
-       gcc $(CFLAGS) ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+       gcc $(CFLAGS) ../codec/compat/getopt.c ../codec/index.c ../codec/convert.c ../codec/j2k_to_image.c -o JPWL_j2k_to_image -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
 \r
 JPWL_image_to_j2k: ../codec/image_to_j2k.c\r
-       gcc $(CFLAGS) ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
+       gcc $(CFLAGS) ../codec/compat/getopt.c ../codec/index.c ../codec/convert.c ../codec/image_to_j2k.c -o JPWL_image_to_j2k -I ../libopenjpeg/ -L . -lopenjpeg_JPWL -lm -ltiff\r
 \r
 install: OpenJPEG\r
        install -d '$(DESTDIR)$(INSTALL_LIBDIR)' '$(DESTDIR)$(INSTALL_INCLUDE)'\r