From 12dfaa2d74ffae0d08cd9b8d32f9a2f9fbfe394c Mon Sep 17 00:00:00 2001
From: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Fri, 2 Dec 2011 15:35:47 +0000
Subject: [PATCH] Sorry. Reverting mistake.

---
 applications/jpip/libopenjpip/comMakefile.mk | 4 ++--
 applications/jpip/util/Makefile.nix          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/jpip/libopenjpip/comMakefile.mk b/applications/jpip/libopenjpip/comMakefile.mk
index 53d59b83..1401b70f 100644
--- a/applications/jpip/libopenjpip/comMakefile.mk
+++ b/applications/jpip/libopenjpip/comMakefile.mk
@@ -1,9 +1,9 @@
 ifdef jpipserver
-CFLAGS  = -g -Wall -DSERVER
+CFLAGS  = -O3 -Wall -m32 -DSERVER
 LIBNAME = libopenjpip_server.a
 else
 J2KINCDIR = ../../../libopenjpeg
-CFLAGS  = -g -Wall  -I$(J2KINCDIR)
+CFLAGS  = -O3 -Wall  -I$(J2KINCDIR)
 LIBNAME = libopenjpip_local.a
 endif
 
diff --git a/applications/jpip/util/Makefile.nix b/applications/jpip/util/Makefile.nix
index 39397a4c..532b743d 100644
--- a/applications/jpip/util/Makefile.nix
+++ b/applications/jpip/util/Makefile.nix
@@ -1,12 +1,12 @@
 JPIPLIBDIR = ../libopenjpip
 
 SLIBFNAME = $(JPIPLIBDIR)/libopenjpip_server.a
-SCFLAGS  = -g -Wall -I$(JPIPLIBDIR) -DSERVER -DQUIT_SIGNAL=\"quitJPIP\"
+SCFLAGS  = -O3 -Wall -m32 -I$(JPIPLIBDIR) -DSERVER -DQUIT_SIGNAL=\"quitJPIP\"
 SLDFLAGS = -L$(JPIPLIBDIR) -lm -lfcgi -lopenjpip_server
 
 J2KINCDIR = ../../../libopenjpeg
-J2KLIBDIR = $(J2KINCDIR)/../bin/bin
-LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.so
+J2KLIBDIR = $(J2KINCDIR)/.libs
+LIBFNAME = $(JPIPLIBDIR)/libopenjpip_local.a $(J2KLIBDIR)/libopenjpeg.a
 CFLAGS  = -O3 -Wall -I$(JPIPLIBDIR)
 LDFLAGS = -L$(JPIPLIBDIR) -L$(J2KLIBDIR) -lm -lopenjpip_local