remove obsolete directory "CVSROOT"

[openjpeg.git] / OPJViewer / Makefile

diff --git a/OPJViewer/Makefile b/OPJViewer/Makefile
index 1224f421f0dd2f1d0726dbf707f2b25077be857a..d3cb34164ec7ceeac13d73a18623090468e11e74 100644 (file)
--- a/OPJViewer/Makefile
+++ b/OPJViewer/Makefile
@@ -1,41 +1,41 @@
-# Makefile for the main JPWL OpenJPEG codecs: JPWL_ j2k_to_image and JPWL_image_to_j2k
-
-# General configuration variables:
-CC = $(shell wx-config-2.8 --cxx)
-AR = ar
-
-CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL
-
-OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp
-
-MODULES = $(OPJV_SRCS:.cpp=.o)
-
-all: opjviewer lib
-
-.cpp.o:
-       $(CC) $(CFLAGS) -c $< -o $@
-
-lib:
-       cd ../jpwl; make
-
-opjviewer: $(OPJV_SRCS) lib
-       $(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)  
-
-
-clean:
-       rm -f OPJViewer *.o *.a
-       cd ../libopenjpeg; rm -f *.o
-
-
-
-
-#.cpp.o :
-#      $(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<
-
-#all:    $(PROGRAM)
-
-#$(PROGRAM):     $(OBJECTS)
-#      $(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`
-
-#clean:
-#      rm -f *.o $(PROGRAM)
+# Makefile for OPJViewer\r
+\r
+# General configuration variables:\r
+CC = $(shell wx-config-2.8 --cxx)\r
+AR = ar\r
+\r
+CFLAGS = -DUSE_JPWL -DwxUSE_LIBOPENJPEG -DwxUSE_GUI=1 -DOPJ_STATIC -DOPJ_HTMLABOUT $(shell wx-config-2.8 --cxxflags) # -g -p -pg -DUSE_JPWL\r
+\r
+OPJV_SRCS = source/imagj2k.cpp source/imagmj2.cpp source/wxj2kparser.cpp source/imagjp2.cpp source/OPJViewer.cpp source/wxjp2parser.cpp source/OPJViewer.cpp source/OPJThreads.cpp\r
+\r
+MODULES = $(OPJV_SRCS:.cpp=.o)\r
+\r
+all: opjviewer lib\r
+\r
+.cpp.o:\r
+       $(CC) $(CFLAGS) -c $< -o $@\r
+\r
+lib:\r
+       cd ../jpwl; make\r
+\r
+opjviewer: $(OPJV_SRCS) lib\r
+        $(CC) $(CFLAGS) -I .. $(OPJV_SRCS) -o OPJViewer -L ../jpwl -lopenjpeg_JPWL -lm -lstdc++ -ltiff $(shell wx-config-2.8 --libs)\r
+\r
+\r
+clean:\r
+       rm -f OPJViewer *.o *.a\r
+       cd ../libopenjpeg; rm -f *.o\r
+\r
+\r
+\r
+\r
+#.cpp.o :\r
+#       $(CXX) -g -c `wx-config-2.8 --cxxflags` -I ../.. -D wxUSE_LIBOPENJPEG -D wxHACK_BOOLEAN -o $@ $<\r
+\r
+#all:    $(PROGRAM)\r
+\r
+#$(PROGRAM):     $(OBJECTS)\r
+#       $(CXX) -o $(PROGRAM) $(OBJECTS) -lopenjpeg -L ../.. `wx-config-2.8 --libs`\r
+\r
+#clean:\r
+#       rm -f *.o $(PROGRAM)\r