- Fix ANSI labels to put EOF1 and EOF2 after each file mark.

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

diff --git a/bacula/src/wx-console/Makefile.mingw b/bacula/src/wx-console/Makefile.mingw
index 89612811a34c0cf73b36169eee1d1376d3c4f8c5..697491c6178d1b5d497a744a2f622eb5c40b97d9 100644 (file)
--- a/bacula/src/wx-console/Makefile.mingw
+++ b/bacula/src/wx-console/Makefile.mingw
@@ -2,8 +2,8 @@ CPP  = g++.exe -D__DEBUG__ -DHAVE_MINGW -DHAVE_WIN32
 CC   = gcc.exe -D__DEBUG__ -DHAVE_MINGW -DHAVE_WIN32
 WINDRES = windres.exe
 RES  = wx-console_private.res
-OBJ  = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o $(RES)
-LINKOBJ  = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o $(RES)
+OBJ  = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o $(RES)
+LINKOBJ  = main.o console_thread.o authenticate.o console_conf.o wxbrestorepanel.o wxbmainframe.o wxbtableparser.o wxbtreectrl.o wxblistctrl.o wxbutils.o wxbconfigpanel.o wxbconfigfileeditor.o wxbhistorytextctrl.o $(RES)
 LIBS =  -L"../lib" -mwindows -Wl,--subsystem,windows -lbac `wx-config --libs`  -g3 /MinGW/lib/libpthreadGC.a
 INCS =   -I".."  -I"../lib" -I"../win32/compat/" 
 CXXINCS =  -I".."  -I"../lib" -I"../win32/compat/" 
@@ -23,7 +23,7 @@ $(BIN): $(OBJ) ../lib/libbac.a
        $(CPP) $(LINKOBJ) -o "wx-console.exe" $(LIBS)
 
 ../lib/libbac.a: ../lib/*.c*
-       (cd ../lib/; $(MAKE) -f Makefile.mingw DESTDIR=$(DESTDIR))
+       (cd ../lib/; make -f Makefile.mingw)
        @rm -f bacula-fd.exe
 
 main.o: main.cpp
@@ -56,5 +56,14 @@ wxblistctrl.o: wxblistctrl.cpp
 wxbutils.o: wxbutils.cpp
        $(CPP) -c wxbutils.cpp -o wxbutils.o $(CXXFLAGS)
 
+wxbconfigpanel.o: wxbconfigpanel.cpp
+       $(CPP) -c wxbconfigpanel.cpp -o wxbconfigpanel.o $(CXXFLAGS)
+
+wxbconfigfileeditor.o: wxbconfigfileeditor.cpp
+       $(CPP) -c wxbconfigfileeditor.cpp -o wxbconfigfileeditor.o $(CXXFLAGS)
+    
+wxbhistorytextctrl.o: wxbhistorytextctrl.cpp
+       $(CPP) -c wxbhistorytextctrl.cpp -o wxbhistorytextctrl.o $(CXXFLAGS)
+
 wx-console_private.res: wx-console_private.rc 
        $(WINDRES) -i wx-console_private.rc -I rc -o wx-console_private.res -O coff