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

diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index e47736baba..3115125c4a 100644
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -21,20 +21,33 @@ dummy:
 
 #
 CONSSRCS = main.cpp console_thread.cpp authenticate.c console_conf.c wxbrestorepanel.cpp \
-	     wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp
+	     wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp \
+	     wxbconfigpanel.cpp wxbconfigfileeditor.cpp wxbhistorytextctrl.cpp
 CONSOBJS = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o \
-	     wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o
+	     wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o \
+	     wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o
 
 win32 = wx-console_private.res
 
 WIN32RES = $(@WIN32@)
 
+macosx = wx-console.app
+
+MACOSXAPP = $(@MACOSX@)
+
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
+macosx_cppflags = -DHAVE_MACOSX -DNO_GCC_PRAGMA
+
+_cppflags = 
+
 # wx-config generated by configure
-CONS_CPPFLAGS=@WXCONS_CPPFLAGS@
+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:
@@ -42,22 +55,35 @@ 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) $<
 
 
 #-------------------------------------------------------------------------
-all: Makefile wx-console
+all: Makefile wx-console $(MACOSXAPP)
 	@echo "==== Make of wx-console is good ===="
 	@echo " "
 
+# Mac OS X application bundle
+# 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/Contents
+	-mkdir wx-console.app/Contents/MacOS
+	-mkdir wx-console.app/Contents/Resources
+	-mkdir wx-console.app/Contents/Resources/English.lproj
+	echo -n 'APPL????' > wx-console.app/Contents/PkgInfo
+	mv wx-console wx-console.app/Contents/MacOS/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
 	
@@ -101,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
 
 # -----------------------------------------------------------------------