X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fgnome2-console%2FMakefile.in;h=ba737939c4b43d362c9c4f26108137d3d33d8d51;hb=377bf815eefec1e61a1e97469ae972a52aefde58;hp=1cb408db6344cdb247c715f75a46a9b45f74b9a4;hpb=daa1604b7ce33652ec583dcd2efc69d31a837cd9;p=bacula%2Fbacula diff --git a/bacula/src/gnome2-console/Makefile.in b/bacula/src/gnome2-console/Makefile.in index 1cb408db63..ba737939c4 100644 --- a/bacula/src/gnome2-console/Makefile.in +++ b/bacula/src/gnome2-console/Makefile.in @@ -26,8 +26,10 @@ GNOME_LIBS = @GNOME_LIBS@ # -CONSSRCS = console.c console_conf.c authenticate.c support.c interface.c callbacks.c -CONSOBJS = console.o console_conf.o authenticate.o support.o interface.o callbacks.o +CONSSRCS = console.c console_conf.c authenticate.c support.c interface.c callbacks.c \ + restore.c +CONSOBJS = console.o console_conf.o authenticate.o support.o interface.o callbacks.o \ + restore.o # these are the objects that are changed by the .configure process EXTRAOBJS = @OBJLIST@ @@ -37,7 +39,7 @@ EXTRAOBJS = @OBJLIST@ #CONS_LDFLAGS=@CONS_LDFLAGS@ $(GNOME_LIBDIR) $(GNOMEUI_LIBS) CONS_INC=$(GNOME_INCLUDEDIR) -CONS_LIBS=$(GNOME_LIBS) +CONS_LIBS=$(GNOME_LIBS) $(OPENSSL_LIBS) CONS_LDFLAGS=$(GNOME_LIBDIR) $(GNOMEUI_LIBS) @@ -47,10 +49,11 @@ CONS_LDFLAGS=$(GNOME_LIBDIR) $(GNOMEUI_LIBS) # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + @echo "Compiling $<" + $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- -all: Makefile gnome-console @STATIC_GNOME_CONS@ - @echo "==== Make of gnome-console is good ====" +all: Makefile bgnome-console @STATIC_GNOME_CONS@ + @echo "==== Make of bgnome-console is good ====" @echo " " support.o: support.c @@ -59,36 +62,50 @@ support.o: support.c sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< -gnome-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a - $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm +bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \ + $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm -static-console: static-gnome-console +static-console: static-bgnome-console -static-gnome-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a - $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \ - $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm +static-bgnome-console: Makefile $(CONSOBJS) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) + $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \ + $(LIBS) $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm strip $@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status cd $(topdir) \ && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -clean: - @$(RMF) gnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3 - @$(RMF) static-gnome-console gmon.out +libtool-clean: + @$(RMF) -r .libs _libs + +clean: libtool-clean + @$(RMF) bgnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3 + @$(RMF) static-bgnome-console gmon.out Makefile.am realclean: clean @$(RMF) tags - @$(RM) -rf .deps gnome-console.conf + @$(RM) -rf .deps bgnome-console.conf distclean: realclean if test $(srcdir) = .; then $(MAKE) realclean; fi - (cd $(srcdir); $(RMF) Makefile; $(RMF) -r CVS) + (cd $(srcdir); $(RMF) Makefile) + +devclean: realclean + if test $(srcdir) = .; then $(MAKE) realclean; fi + (cd $(srcdir); $(RMF) Makefile) install: all - $(INSTALL_PROGRAM) gnome-console $(DESTDIR)$(sbindir)/gnome-console - @srcconf=gnome-console.conf; \ + @if test -f ${DESTDIR}${sbindir}/gnome-console; then \ + echo " "; \ + echo "Warning!!! ${DESTDIR}${sbindir}gnome-console found."; \ + echo " gnome-console has been renamed bgnome-console, so gnome-console"; \ + echo " is no longer used, and you might want to delete it."; \ + echo " "; \ + fi + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) bgnome-console $(DESTDIR)$(sbindir)/bgnome-console + @srcconf=bgnome-console.conf; \ if test -f ${DESTDIR}${sysconfdir}/$$srcconf; then \ destconf=$$srcconf.new; \ echo " ==> Found existing $$srcconf, installing new conf file as $$destconf"; \ @@ -97,16 +114,19 @@ install: all fi; \ echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \ ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf - if test -f static-gnome-console; then \ - $(INSTALL_PROGRAM) static-gnome-console $(DESTDIR)$(sbindir)/static-gnome-console; \ + if test -f static-bgnome-console; then \ + $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bgnome-console $(DESTDIR)$(sbindir)/static-bgnome-console; \ fi uninstall: + (cd $(DESTDIR)$(sbindir); $(RMF) bgnome-console static-bgnome-console) + (cd $(DESTDIR)$(sysconfdir); $(RMF) bgnome-console.conf bgnome-console.conf.new) (cd $(DESTDIR)$(sbindir); $(RMF) gnome-console static-gnome-console) (cd $(DESTDIR)$(sysconfdir); $(RMF) gnome-console.conf gnome-console.conf.new) + # Semi-automatic generation of dependencies: # Use gcc -MM because X11 `makedepend' doesn't work on all systems # and it also includes system headers. @@ -116,7 +136,7 @@ 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) $(XINC) -I$(srcdir) -I$(basedir) $(GNOME_INCLUDEDIR) $(SQL_INC) *.c >> Makefile + @$(CXX) -S -M $(CPPFLAGS) $(XINC) -I$(srcdir) -I$(basedir) $(GNOME_INCLUDEDIR) $(SQL_INC) *.c >> Makefile @if test -f Makefile ; then \ $(RMF) Makefile.bak; \ else \