reverted all my changes

svn path=/trunk/externals/pix_opencv/; revision=12571

1 files changed, 35 insertions, 124 deletions

diff --git a/Makefile b/Makefile
index 4c76898..3c7039c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,143 +1,54 @@
-# To use this Makefile for your project, first put the name of your library in
-# LIBRARY_NAME variable. The folder for your project should have the same name
-# as your library.
-LIBRARY_NAME = pix_opencv
-LIBRARY_VERSION = 0.2
+PD_DIR = /Software/pd-svn/trunk/pd
+GEM_DIR = /usr/local/pd/gem
 
-# Next, add your source files to the SOURCES variable.
-SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc pix_opencv_surf.cc
+GEM_OPENCV_VERSION = 0.2
 
-# For objects that only build on certain platforms, add those to the SOURCES
-# line for the right platforms.
-SOURCES_Darwin = 
-SOURCES_Linux = 
-SOURCES_Windows = 
+# build flags
 
-#------------------------------------------------------------------------------#
-#
-# you shouldn't need to edit anything below here, if we did it right :)
-#
-#------------------------------------------------------------------------------#
+INCLUDES =  -I$(PD_DIR)/src -I.  -I$(GEM_DIR)/src -I$(PD_DIR)/src
+CPPFLAGS  = -fPIC -DPD -O2 -funroll-loops -fomit-frame-pointer  -ffast-math \
+    -Wall -W -Wno-unused -Wno-parentheses -Wno-switch \
+    -DGEM_OPENCV_VERSION=\"$(GEM_OPENCV_VERSION)\" -g
 
-# where Pd lives
-PD_PATH = ../../pd
-GEM_PATH = ../../Gem
-# where to install the library
-objectsdir = $(PD_PATH)/extra
-
-CFLAGS = -DPD -I$(PD_PATH)/src -I$(GEM_PATH)/src -Wall -W -g
-LDFLAGS =  
-LIBS = 
 
 UNAME := $(shell uname -s)
-ifeq ($(UNAME),Darwin)
-  SOURCES += $(SOURCES_Darwin)
-  EXTENSION = pd_darwin
-  OS = macosx
-  OPT_CFLAGS = -fast
-  FAT_FLAGS = -arch i386 -arch ppc -mmacosx-version-min=10.4
-  CFLAGS += -fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-  LDFLAGS += -bundle -undefined dynamic_lookup -isysroot /Developer/SDKs/MacOSX10.4u.sdk
-  LIBS += -lc -framework OpenCV
-  STRIP = strip -x
- endif
 ifeq ($(UNAME),Linux)
-  SOURCES += $(SOURCES_Linux)
-  EXTENSION = pd_linux
-  OS = linux
-  OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer
-  CFLAGS += -fPIC
-  LDFLAGS += -Wl,--export-dynamic  -shared -fPIC
-  LIBS += -lc
-  STRIP = strip --strip-unneeded -R .note -R .comment
+ CPPFLAGS += -DLINUX
+ INCLUDES += `pkg-config --cflags opencv`
+ LDFLAGS =  -export_dynamic -shared
+ LIBS = `pkg-config --libs opencv`
+ EXTENSION = pd_linux
 endif
-ifeq (MINGW,$(findstring MINGW,$(UNAME)))
-  SOURCES += $(SOURCES_Windows)
-  EXTENSION = dll
-  OS = windows
-  OPT_CFLAGS = -O3 -funroll-loops -fomit-frame-pointer -march=i686 -mtune=pentium4
-  WINDOWS_HACKS = -D'O_NONBLOCK=1'
-  CFLAGS += -mms-bitfields $(WINDOWS_HACKS)
-  LDFLAGS += -s -shared -Wl,--enable-auto-import
-  LIBS += -L$(PD_PATH)/src -L$(PD_PATH)/bin -L$(PD_PATH)/obj -lpd -lwsock32 -lkernel32 -luser32 -lgdi32
-  STRIP = strip --strip-unneeded -R .note -R .comment
+ifeq ($(UNAME),Darwin)
+ CPPFLAGS += -DDARWIN
+ INCLUDES += -I/System/Library/Frameworks/OpenCV.framework/Headers/
+ LDFLAGS =  -bundle -undefined dynamic_lookup
+ LIBS =  -lm -framework OpenCV
+ EXTENSION = pd_darwin
 endif
 
-CFLAGS += $(OPT_CFLAGS)
-
-
-.PHONY = install libdir_install single_install install-doc install-exec clean dist etags
-
-all: $(SOURCES:.cc=.$(EXTENSION))
-
-%.$(EXTENSION): %.cc
-	$(CXX) $(CFLAGS) -o "$*.o" -c "$*.cc"
-	$(CC) $(LDFLAGS) -o "$*.$(EXTENSION)" "$*.o"  $(LIBS)
-	chmod a-x "$*.$(EXTENSION)"
-	rm -f -- $*.o
+.SUFFIXES = $(EXTENSION)
 
+SOURCES = pix_opencv_edge.cc pix_opencv_laplace.cc pix_opencv_morphology.cc pix_opencv_distrans.cc pix_opencv_motempl.cc pix_opencv_haarcascade.cc pix_opencv_contours_boundingrect.cc pix_opencv_bgsubstract.cc pix_opencv_contours_convexity.cc pix_opencv_dft.cc pix_opencv_lk.cc pix_opencv_hist_compare.cc pix_opencv_knear.cc pix_opencv_threshold.cc pix_opencv_floodfill.cc pix_opencv_athreshold.cc pix_opencv_bgstats.cc pix_opencv_camshift.cc pix_opencv_hu_compare.cc pix_opencv_pgh_compare.cc pix_opencv_hough_circles.cc pix_opencv_hough_lines.cc pix_opencv_hu_moments.cc pix_opencv_contours_convexhull.cc pix_opencv_colorfilt.cc
+SOURCES_OPT = pix_opencv_surf.cc
 
-install: libdir_install
+all: $(SOURCES:.cc=.$(EXTENSION)) $(SOURCES_OPT:.cc=.$(EXTENSION))
 
-# The meta and help files are explicitly installed to make sure they are
-# actually there.  Those files are not optional, then need to be there.
-libdir_install: $(SOURCES:.cc=.$(EXTENSION)) install-doc install-exec
-	install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(LIBRARY_NAME)-meta.pd $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(SOURCES:.c=.$(EXTENSION)) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	$(STRIP) $(addprefix $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/,$(SOURCES:.cc=.$(EXTENSION)))
+%.$(EXTENSION): %.o
+	gcc $(LDFLAGS) -o $*.$(EXTENSION) $*.o $(LIBS)
 
-# install library linked as single binary
-single_install: $(LIBRARY_NAME) install-doc install-exec
-	install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(LIBRARY_NAME).$(EXTENSION) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	$(STRIP) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/$(LIBRARY_NAME).$(EXTENSION)
+.cc.o:
+	g++ $(CPPFLAGS) $(INCLUDES) -o $*.o -c $*.cc
 
-install-doc:
-	install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-#	install -m644 -p $(SOURCES:.c=-help.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p README $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/README.txt
-	install -m644 -p VERSION $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/VERSION.txt
-	install -m644 -p CHANGES $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)/CHANGES.txt
-
-install-exec:
-	install -d $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
-	install -m644 -p $(wildcard *.pd) $(DESTDIR)$(objectsdir)/$(LIBRARY_NAME)
+.c.o:
+	gcc $(CPPFLAGS) $(INCLUDES) -o $*.o -c $*.c
 
+install:
+	cp -f --remove-destination *.pd $(PD_DIR)/doc/5.reference
 
 clean:
-	-rm -f -- $(SOURCES:.cc=.o)
-	-rm -f -- $(SOURCES:.cc=.$(EXTENSION))
-	-rm -f -- $(LIBRARY_NAME).$(EXTENSION)
-
-distclean: clean
-	-rm -f -- ../$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2
-	-rm -f -- ../$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS).tar.bz2
-
-dist: all dist_$(OS)
-
-dist_linux:
-	cd .. && tar --exclude=.svn -cjpf \
-		$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2 \
-		$(LIBRARY_NAME)
-
-dist_macosx:
-	cd .. && tar --exclude=.svn -cjpf \
-		$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS)-$(shell uname -m).tar.bz2 \
-		$(LIBRARY_NAME)
-
-dist_windows:
-	cd .. && tar --exclude=.svn -cjpf \
-		$(LIBRARY_NAME)-$(LIBRARY_VERSION)-$(OS).tar.bz2 \
-		$(LIBRARY_NAME)
-
-etags:
-	etags *.[ch] ../../pd/src/*.[ch] /usr/include/*.h /usr/include/*/*.h
+	rm -f pix_opencv*.o
+	rm -f pix_opencv*.$(EXTENSION)
 
-showpaths:
-	@echo "PD_PATH: $(PD_PATH)"
-	@echo "GEM_PATH: $(GEM_PATH)"
-	@echo "objectsdir: $(objectsdir)"
-	@echo "LIBRARY_NAME: $(LIBRARY_NAME)"
-	@echo "SOURCES: $(SOURCES)"
+distro: clean all
+	rm *.o