Some Win32 fixes

[bacula/bacula] / bacula / src / wx-console / Makefile.in

diff --git a/bacula/src/wx-console/Makefile.in b/bacula/src/wx-console/Makefile.in
index 9fc9fed5fa6fbb4cc0e184339aef5c0e06751c11..0457717cbac1845818f841ce19b1ccbeb301e607 100644 (file)
--- a/bacula/src/wx-console/Makefile.in
+++ b/bacula/src/wx-console/Makefile.in
@@ -22,20 +22,28 @@ dummy:
 #
 CONSSRCS = main.cpp console_thread.cpp authenticate.c console_conf.c wxbrestorepanel.cpp \
             wxbmainframe.cpp wxbtableparser.cpp wxbtreectrl.cpp wxblistctrl.cpp wxbutils.cpp \
-            wxbconfigpanel.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 \
-            wxbconfigpanel.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@
 
 .SUFFIXES:     .cpp .c .o
@@ -53,7 +61,7 @@ CONS_LDFLAGS=@WXCONS_LDFLAGS@
 
 
 #-------------------------------------------------------------------------
-all: Makefile wx-console
+all: Makefile wx-console $(MACOSXAPP)
        @echo "==== Make of wx-console is good ===="
        @echo " "
 
@@ -68,7 +76,7 @@ wx-console.app: wx-console
        -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 wx-console.app/Contents/MacOS/wx-console.conf
+       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