X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fwx-console%2FMakefile.in;h=3115125c4acba62fb13b4adcb08fc59d28f1ccb8;hb=dec2e17baf8ea0c3ce5dbcc8a035336deddfbede;hp=0457717cbac1845818f841ce19b1ccbeb301e607;hpb=38bdcf6ff540827954e113a59348fda1d1be884c;p=bacula%2Fbacula

diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index 0457717cba..3115125c4a 100644
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -45,6 +45,9 @@ _cppflags =
 # wx-config generated by configure
 CONS_CPPFLAGS=-DHAVE_WXCONSOLE @WXCONS_CPPFLAGS@ $(@MACOSX@_cppflags)
 CONS_LDFLAGS=@WXCONS_LDFLAGS@
+OPENSSL_INC = @OPENSSL_INC@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+
 
 .SUFFIXES:     .cpp .c .o
 .PHONY:
@@ -52,12 +55,12 @@ CONS_LDFLAGS=@WXCONS_LDFLAGS@
 
 # inference rules
 .c.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) -I$(srcdir) \
-	   -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
+	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) \
+ $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
 
 .cpp.o:
-	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) -I$(srcdir) \
-	   -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
+	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_CPPFLAGS) $(CONS_INC) \
+ $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(WCFLAGS) $(CFLAGS) $<
 
 
 #-------------------------------------------------------------------------
@@ -69,7 +72,7 @@ all: Makefile wx-console $(MACOSXAPP)
 # See http://216.239.59.104/search?q=cache:a61SGKgoHSQJ:wiki.wxwidgets.org/wiki.pl%3FWxMac_Issues+wxmac+%22application+bundle%22&hl=fr
 
 wx-console.app: wx-console
-	-mkdir wx-console.app    
+	-mkdir wx-console.app	 
 	-mkdir wx-console.app/Contents
 	-mkdir wx-console.app/Contents/MacOS
 	-mkdir wx-console.app/Contents/Resources
@@ -79,7 +82,8 @@ wx-console.app: wx-console
 	cp wx-console.conf /Library/Preferences/org.bacula.wxconsole.conf
 
 wx-console: $(CONSOBJS) @WIN32@ ../lib/libbac.a
-	$(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) -lbac
+	$(CXX) $(CONSOBJS) $(WIN32RES) -o $@ $(LIBS) -L../lib $(CONS_LDFLAGS) \
+ -lbac $(OPENSSL_LIBS)
 
 win32: wx-console_private.res
 	
@@ -123,12 +127,12 @@ depend:
 	@$(MV) Makefile Makefile.bak
 	@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
 	@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-	@$(CC) -S -M $(CPPFLAGS) $(CONS_CPPFLAGS) -I$(srcdir) -I$(basedir) $(CONSSRCS) >> Makefile
+	@$(CXX) -S -M $(CPPFLAGS) $(CONS_CPPFLAGS) -I$(srcdir) -I$(basedir) $(CONSSRCS) >> Makefile
 	@if test -f Makefile ; then \
 	    $(RMF) Makefile.bak; \
 	else \
 	   $(MV) Makefile.bak Makefile; \
-	   echo -e "Something went wrong\n\a"; \
+	   echo " ===== Something went wrong in make depend ====="; \
 	fi
 
 # -----------------------------------------------------------------------