[Libaim-cvs] libaim-ac/src Makefile.am,1.1.1.1,1.2 Makefile.in,1.1.1.1,1.2 aimsession.cpp,1.1.1.1,1.2 server.cpp,1.1.1.1,1.2

[<ato...@us...>]

Update of /cvsroot/libaim/libaim-ac/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7012/src

Modified Files:
	Makefile.am Makefile.in aimsession.cpp server.cpp 
Log Message:
- Updated configuration files so jaim (client example) and aimd (server 
  example) are compiled.
- aimsession.cpp: I did something, but I don't remember what.
- server.cpp: Fixed a few warnings.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	26 Feb 2003 14:25:20 -0000	1.1.1.1
--- Makefile.am	26 Feb 2003 18:16:54 -0000	1.2
***************
*** 4,6 ****
  libaim_la_LDFLAGS = -version-info 0:0:0
  
! CPPFLAGS = -I../include
--- 4,12 ----
  libaim_la_LDFLAGS = -version-info 0:0:0
  
! bin_PROGRAMS = jaim aimd
! jaim_SOURCES = jaim.cpp
! jaim_LDADD = -laim
! aimd_SOURCES = server.cpp
! aimd_LDADD = -laim
! 
! CPPFLAGS = -I../include -DDEBUG=$(DEBUG)

Index: Makefile.in
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	26 Feb 2003 14:25:20 -0000	1.1.1.1
--- Makefile.in	26 Feb 2003 18:16:54 -0000	1.2
***************
*** 90,94 ****
  libaim_la_LDFLAGS = -version-info 0:0:0
  
! CPPFLAGS = -I../include
  subdir = src
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 90,100 ----
  libaim_la_LDFLAGS = -version-info 0:0:0
  
! bin_PROGRAMS = jaim aimd
! jaim_SOURCES = jaim.cpp
! jaim_LDADD = -laim
! aimd_SOURCES = server.cpp
! aimd_LDADD = -laim
! 
! CPPFLAGS = -I../include -DDEBUG=$(DEBUG)
  subdir = src
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 101,104 ****
--- 107,121 ----
  	flap.lo htmlparser.lo tlv.lo
  libaim_la_OBJECTS = $(am_libaim_la_OBJECTS)
+ bin_PROGRAMS = jaim$(EXEEXT) aimd$(EXEEXT)
+ PROGRAMS = $(bin_PROGRAMS)
+ 
+ am_aimd_OBJECTS = server.$(OBJEXT)
+ aimd_OBJECTS = $(am_aimd_OBJECTS)
+ aimd_DEPENDENCIES =
+ aimd_LDFLAGS =
+ am_jaim_OBJECTS = jaim.$(OBJEXT)
+ jaim_OBJECTS = $(am_jaim_OBJECTS)
+ jaim_DEPENDENCIES =
+ jaim_LDFLAGS =
  
  DEFS = @DEFS@
***************
*** 112,115 ****
--- 129,133 ----
  @AMDEP_TRUE@	./$(DEPDIR)/defaultaimlistener.Plo \
  @AMDEP_TRUE@	./$(DEPDIR)/flap.Plo ./$(DEPDIR)/htmlparser.Plo \
+ @AMDEP_TRUE@	./$(DEPDIR)/jaim.Po ./$(DEPDIR)/server.Po \
  @AMDEP_TRUE@	./$(DEPDIR)/tlv.Plo
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
***************
*** 122,128 ****
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(libaim_la_SOURCES)
  DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libaim_la_SOURCES)
  
  all: all-am
--- 140,146 ----
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  CXXFLAGS = @CXXFLAGS@
! DIST_SOURCES = $(libaim_la_SOURCES) $(aimd_SOURCES) $(jaim_SOURCES)
  DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libaim_la_SOURCES) $(aimd_SOURCES) $(jaim_SOURCES)
  
  all: all-am
***************
*** 159,162 ****
--- 177,213 ----
  libaim.la: $(libaim_la_OBJECTS) $(libaim_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(libdir) $(libaim_la_LDFLAGS) $(libaim_la_OBJECTS) $(libaim_la_LIBADD) $(LIBS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	     || test -f $$p1 \
+ 	  ; then \
+ 	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+ 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+ 	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+ 	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-binPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+ 	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+ 	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+ 	  rm -f $(DESTDIR)$(bindir)/$$f; \
+ 	done
+ 
+ clean-binPROGRAMS:
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ aimd$(EXEEXT): $(aimd_OBJECTS) $(aimd_DEPENDENCIES) 
+ 	@rm -f aimd$(EXEEXT)
+ 	$(CXXLINK) $(aimd_LDFLAGS) $(aimd_OBJECTS) $(aimd_LDADD) $(LIBS)
+ jaim$(EXEEXT): $(jaim_OBJECTS) $(jaim_DEPENDENCIES) 
+ 	@rm -f jaim$(EXEEXT)
+ 	$(CXXLINK) $(jaim_LDFLAGS) $(jaim_OBJECTS) $(jaim_LDADD) $(LIBS)
  
  mostlyclean-compile:
***************
*** 171,174 ****
--- 222,227 ----
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flap.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/htmlparser.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jaim.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tlv.Plo@am__quote@
  
***************
*** 268,275 ****
  check-am: all-am
  check: check-am
! all-am: Makefile $(LTLIBRARIES)
  
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(libdir)
  
  install: install-am
--- 321,330 ----
  check-am: all-am
  check: check-am
! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
! install-binPROGRAMS: install-libLTLIBRARIES
! 
  
  installdirs:
! 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
  
  install: install-am
***************
*** 299,304 ****
  clean: clean-am
  
! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
! 	mostlyclean-am
  
  distclean: distclean-am
--- 354,359 ----
  clean: clean-am
  
! clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
! 	clean-libtool mostlyclean-am
  
  distclean: distclean-am
***************
*** 317,321 ****
  install-data-am:
  
! install-exec-am: install-libLTLIBRARIES
  
  install-info: install-info-am
--- 372,376 ----
  install-data-am:
  
! install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
  
  install-info: install-info-am
***************
*** 334,350 ****
  	mostlyclean-libtool
  
! uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
  
! .PHONY: GTAGS all all-am check check-am clean clean-generic \
! 	clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
! 	distclean-depend distclean-generic distclean-libtool \
! 	distclean-tags distdir dvi dvi-am info info-am install \
! 	install-am install-data install-data-am install-exec \
! 	install-exec-am install-info install-info-am \
! 	install-libLTLIBRARIES install-man install-strip installcheck \
! 	installcheck-am installdirs maintainer-clean \
! 	maintainer-clean-generic mostlyclean mostlyclean-compile \
! 	mostlyclean-generic mostlyclean-libtool tags uninstall \
! 	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 389,407 ----
  	mostlyclean-libtool
  
! uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
! 	uninstall-libLTLIBRARIES
  
! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
! 	clean-generic clean-libLTLIBRARIES clean-libtool distclean \
! 	distclean-compile distclean-depend distclean-generic \
! 	distclean-libtool distclean-tags distdir dvi dvi-am info \
! 	info-am install install-am install-binPROGRAMS install-data \
! 	install-data-am install-exec install-exec-am install-info \
! 	install-info-am install-libLTLIBRARIES install-man \
! 	install-strip installcheck installcheck-am installdirs \
! 	maintainer-clean maintainer-clean-generic mostlyclean \
! 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
! 	tags uninstall uninstall-am uninstall-binPROGRAMS \
! 	uninstall-info-am uninstall-libLTLIBRARIES
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

Index: aimsession.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/aimsession.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aimsession.cpp	26 Feb 2003 14:25:20 -0000	1.1.1.1
--- aimsession.cpp	26 Feb 2003 18:16:54 -0000	1.2
***************
*** 176,182 ****
  			{
  				#ifdef DEBUG
! 				/* debuggage */
! 				cerr << "Received MEM_REQUEST:\n";
! 				cerr << flap << "\n\n";
  				#endif
  			}
--- 176,182 ----
  			{
  				#ifdef DEBUG
! 					/* debuggage */
! 					cerr << "Received MEM_REQUEST:\n";
! 					cerr << flap << "\n\n";
  				#endif
  			}

Index: server.cpp
===================================================================
RCS file: /cvsroot/libaim/libaim-ac/src/server.cpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** server.cpp	26 Feb 2003 14:25:20 -0000	1.1.1.1
--- server.cpp	26 Feb 2003 18:16:54 -0000	1.2
***************
*** 30,34 ****
  	unsigned int len = sizeof (struct sockaddr_in);
  	
! 	int fd = accept (s, (struct sockaddr *)&sin, &len);
  	close (s);
  	return fd;
--- 30,34 ----
  	unsigned int len = sizeof (struct sockaddr_in);
  	
! 	int fd = accept (s, (struct sockaddr *)&sin, &(int)len);
  	close (s);
  	return fd;
***************
*** 44,54 ****
  	flap.setChannelID (0x01);
  	flap.writeData (connectionAck, 4);
! 	flap.send( s );
  	cout << "Sending ... " << endl << flap << endl << endl;
  
! 	flap.receive(s);
  	cout << "Received ... " << endl << flap << endl << endl;
  	
! 	flap.receive(s);
  	cout << "Received ... " << endl << flap << endl << endl;
  	
--- 44,54 ----
  	flap.setChannelID (0x01);
  	flap.writeData (connectionAck, 4);
! 	flap.send(/* s */);
  	cout << "Sending ... " << endl << flap << endl << endl;
  
! 	flap.receive(/* s */);
  	cout << "Received ... " << endl << flap << endl << endl;
  	
! 	flap.receive(/* s */);
  	cout << "Received ... " << endl << flap << endl << endl;
  	
***************
*** 59,66 ****
  	const unsigned char plop[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
  	flap.writeData ( plop, 2);
! 	flap.send ( s );
  	cout << "Sending ... " << endl << flap << endl << endl;
  	
! 	flap.receive(s);
  	cout << "Received ... " << endl << flap << endl << endl;
  
--- 59,66 ----
  	const unsigned char plop[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
  	flap.writeData ( plop, 2);
! 	flap.send (/* s */);
  	cout << "Sending ... " << endl << flap << endl << endl;
  	
! 	flap.receive(/* s */);
  	cout << "Received ... " << endl << flap << endl << endl;