[Apcupsd-commits] apcupsd/src/win32 Makefile.in, 1.15, 1.16 winapcupsd.nsi, 1.5, 1.6

[Adam K. <ad...@us...>]

Update of /cvsroot/apcupsd/apcupsd/src/win32
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9239

Modified Files:
	Makefile.in winapcupsd.nsi 
Log Message:
Build smtp executable and include it in install package.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/win32/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile.in	29 Jul 2006 13:37:20 -0000	1.15
+++ Makefile.in	29 Jul 2006 20:27:34 -0000	1.16
@@ -349,14 +349,18 @@
 $(OBJDIR)/reports.o:  ../reports.c
 	$(CXX) -c $< -o $@
 
-# apcupsd
+######################################################################
+
+# apcupsd objects
 OBJS_APCUPSD = \
 	$(OBJDIR)/apcupsd.o
 
 $(OBJDIR)/apcupsd.o:  ../apcupsd.c
 	$(CXX) -c $< -o $@
 
-# apctest
+######################################################################
+
+# apctest objects
 OBJS_APCTEST = \
 	$(OBJDIR)/apctest.o
 
@@ -374,6 +378,15 @@
 
 ######################################################################
 
+# smtp objects
+OBJS_SMTP = \
+	$(OBJDIR)/smtp.o
+
+$(OBJDIR)/smtp.o:	../smtp.c
+	$(CXX) -c $< -o $@
+
+######################################################################
+
 # shutdown objects
 OBJS_SHUT = \
 	$(OBJDIR)/shutdown.o
@@ -428,15 +441,18 @@
 POP_OBJS = $(OBJS_POP)
 POP_LIBS = 
 
+SMTP_OBJS = $(OBJS_SMTP) $(OBJDIR)/apclog.o $(OBJDIR)/asys.o $(OBJDIR)/apcerror.o $(OBJS_COMPAT)
+SMTP_LIBS = $(APC_LIBS)
 
 # Targets
 
-all: apcupsd.exe apcaccess.exe shutdown.exe popup.exe apctest.exe
+all: apcupsd.exe apcaccess.exe shutdown.exe popup.exe apctest.exe smtp.exe
 
 clean:
 	rm -f $(OBJDIR)/*.o $(OBJDIR)/apcupsd.exe $(OBJDIR)/winres.res \
 		$(OBJDIR)/apcaccess.exe $(OBJDIR)/shutdown.exe \
-		$(OBJDIR)/popup.exe winapcupsd*.exe
+		$(OBJDIR)/popup.exe winapcupsd*.exe $(OBJDIR)/smtp.exe \
+		$(OBJDIR)/apctest.exe
 	rm -f pthreadGCE.dll mingwm10.dll
 
 # Link the apcupsd daemon executable ...
@@ -458,6 +474,9 @@
 popup.exe: $(POP_OBJS)
 	$(CXX) $(POP_OBJS) $(POP_LIBS) -mwindows -o $(OBJDIR)/popup.exe
 
+smtp.exe: $(SMTP_OBJS)
+	$(CXX) $(SMTP_OBJS) $(SMTP_LIBS) -o $(OBJDIR)/smtp.exe
+
 winapcupsd.exe: all
 	$(STRIP) *.exe
 	$(MAKENSIS) -V2 -DDEPKGS="$(DEPKGS)" -DVERSION="$(VERSION)" winapcupsd.nsi

Index: winapcupsd.nsi
===================================================================
RCS file: /cvsroot/apcupsd/apcupsd/src/win32/winapcupsd.nsi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- winapcupsd.nsi	29 Jul 2006 13:39:38 -0000	1.5
+++ winapcupsd.nsi	29 Jul 2006 20:27:34 -0000	1.6
@@ -114,7 +114,7 @@
   File pthreadGCE.dll
   File ${DEPKGS}\libusb-win32\libusb0.dll
   File apcupsd.exe
-;  File smtp.exe
+  File smtp.exe
   File apcaccess.exe
   File apctest.exe
   File popup.exe