[Robotflow-cvs] RobotFlow/Probes/src Makefile.am,1.7,1.8

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Probes/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Probes/src

Modified Files:
	Makefile.am 
Log Message:
watch out, a lot of things have been modified in the installation structure, Player and librairies

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	11 May 2004 20:01:04 -0000	1.7
--- Makefile.am	27 May 2004 00:27:40 -0000	1.8
***************
*** 4,12 ****
  #AUTOMAKE_OPTIONS = no-dependencies
  
! install-data-local:
! 	echo "Installing libProbes"
! 	mkdir -p $(OVERFLOW_DATA)/toolbox/$(PACKAGE)
! 	(perl $(OVERFLOW_BIN)/info2def.pl $(top_srcdir)/Probes/src/*.cc $(top_srcdir)/Probes/include/*.h > $(OVERFLOW_DATA)/toolbox/$(PACKAGE)/Probes.def)
! 	(rm $(OVERFLOW_DATA)/lib/Probes.tlb; ln -s $(OVERFLOW_DATA)/lib/libProbes.so $(OVERFLOW_DATA)/lib/Probes.tlb)
  
  lib_LTLIBRARIES = libProbes.la
--- 4,8 ----
  #AUTOMAKE_OPTIONS = no-dependencies
  
! #override libdir=$(OVERFLOW_DATA)/$(PACKAGE)
  
  lib_LTLIBRARIES = libProbes.la
***************
*** 14,24 ****
  # Sources for compilation in the library
  libProbes_la_SOURCES = ImageProbe.cc \
- 	ImageProbeSDL.cc \
  	LaserProbe.cc \
  	VirtualJoystick.cc \
  	ColorTrain.cc \
  	PTZControl.cc
- 			
  
  
  libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB)
--- 10,21 ----
  # Sources for compilation in the library
  libProbes_la_SOURCES = ImageProbe.cc \
  	LaserProbe.cc \
  	VirtualJoystick.cc \
  	ColorTrain.cc \
  	PTZControl.cc
  
+ if WITH_SDL
+ libProbes_la_SOURCES += ImageProbeSDL.cc
+ endif
  
  libProbes_la_LDFLAGS = -release $(LT_RELEASE) $(SDL_LIB)
***************
*** 27,30 ****
  	-I../../Vision/include $(SDL_INCLUDE)
  
- 
  LDADD = $(SDL_LIB)
--- 24,32 ----
  	-I../../Vision/include $(SDL_INCLUDE)
  
  LDADD = $(SDL_LIB)
+ 
+ install-data-local:
+ 	echo "Installing libProbes"
+ 	mkdir -p $(OVERFLOW_DATA)/$(PACKAGE)
+ 	(perl $(OVERFLOW_BIN)/info2def.pl $(libProbes_la_SOURCES) > $(OVERFLOW_DATA)/$(PACKAGE)/Probes.def)
+ 	(rm -f $(OVERFLOW_DATA)/$(PACKAGE)/Probes.tlb; cd $(OVERFLOW_DATA)/$(PACKAGE); ln -s lib/libProbes.so Probes.tlb)