[OpenCALEA-devel] SF.net SVN: opencalea: [26] trunk/src

[<jn...@us...>]

Revision: 26
          http://opencalea.svn.sourceforge.net/opencalea/?rev=26&view=rev
Author:   jnorell
Date:     2007-05-10 16:07:56 -0700 (Thu, 10 May 2007)

Log Message:
-----------
Makefile.am fix

Modified Paths:
--------------
    trunk/src/Makefile.am
    trunk/src/Makefile.in

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-05-10 23:04:31 UTC (rev 25)
+++ trunk/src/Makefile.am	2007-05-10 23:07:56 UTC (rev 26)
@@ -1,6 +1,6 @@
 ## Makefile.am -- Process this file with automake to produce Makefile.in
 AM_CFLAGS = -g -O2 -Wall -Iasn.1/T1.678/CCDeliveryHeader -Iasn.1/T1.IAS/CmII -Iasn.1/T1.678/VoP
-bin_PROGRAMS = tap df_collector lea_collector controller collector
+bin_PROGRAMS = tap df_collector lea_collector
 
 tap_SOURCES = tap.c tap.h common.h calea.c calea.h log_debug.c log_debug.h cc_apdu.c packet_data_header_report.c directsignalreporting.c util.h util.c
 tap_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)

Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	2007-05-10 23:04:31 UTC (rev 25)
+++ trunk/src/Makefile.in	2007-05-10 23:07:56 UTC (rev 26)
@@ -33,7 +33,7 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = tap$(EXEEXT) df_collector$(EXEEXT) \
-	lea_collector$(EXEEXT) controller$(EXEEXT) collector$(EXEEXT)
+	lea_collector$(EXEEXT)
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,12 +45,6 @@
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-collector_SOURCES = collector.c
-collector_OBJECTS = collector.$(OBJEXT)
-collector_LDADD = $(LDADD)
-controller_SOURCES = controller.c
-controller_OBJECTS = controller.$(OBJEXT)
-controller_LDADD = $(LDADD)
 am_df_collector_OBJECTS = df_collector-df_collector.$(OBJEXT) \
 	df_collector-log_debug.$(OBJEXT) df_collector-calea.$(OBJEXT) \
 	df_collector-util.$(OBJEXT)
@@ -89,10 +83,10 @@
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = collector.c controller.c $(df_collector_SOURCES) \
-	$(lea_collector_SOURCES) $(tap_SOURCES)
-DIST_SOURCES = collector.c controller.c $(df_collector_SOURCES) \
-	$(lea_collector_SOURCES) $(tap_SOURCES)
+SOURCES = $(df_collector_SOURCES) $(lea_collector_SOURCES) \
+	$(tap_SOURCES)
+DIST_SOURCES = $(df_collector_SOURCES) $(lea_collector_SOURCES) \
+	$(tap_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -277,12 +271,6 @@
 	  echo " rm -f $$p $$f"; \
 	  rm -f $$p $$f ; \
 	done
-collector$(EXEEXT): $(collector_OBJECTS) $(collector_DEPENDENCIES) 
-	@rm -f collector$(EXEEXT)
-	$(LINK) $(collector_OBJECTS) $(collector_LDADD) $(LIBS)
-controller$(EXEEXT): $(controller_OBJECTS) $(controller_DEPENDENCIES) 
-	@rm -f controller$(EXEEXT)
-	$(LINK) $(controller_OBJECTS) $(controller_LDADD) $(LIBS)
 df_collector$(EXEEXT): $(df_collector_OBJECTS) $(df_collector_DEPENDENCIES) 
 	@rm -f df_collector$(EXEEXT)
 	$(df_collector_LINK) $(df_collector_OBJECTS) $(df_collector_LDADD) $(LIBS)
@@ -299,8 +287,6 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collector.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df_collector-calea.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df_collector-df_collector.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/df_collector-log_debug.Po@am__quote@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.