mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-16 18:25:11 -06:00
patches for Qt/KDE from Dirk Schoenberger
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@933 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
d555bd3f9f
commit
9f4b61c4e1
@ -20,8 +20,11 @@ GNOME_OBJS := $(addprefix obj/gnome/,${COMMON_SRCS:.c=.o})
|
||||
GNOME_OBJS += $(addprefix obj/gnome/,${GNOME_SRCS:.c=.o})
|
||||
MOTIF_OBJS := $(addprefix obj/motif/,${COMMON_SRCS:.c=.o})
|
||||
MOTIF_OBJS += $(addprefix obj/motif/,${MOTIF_SRCS:.c=.o})
|
||||
QT_OBJS := $(addprefix obj/motif/,${COMMON_SRCS:.c=.o})
|
||||
QT_OBJS += $(addprefix obj/qt/,${QT_SRCS:.cpp=.o})
|
||||
|
||||
GTK_CFLAGS := $(shell gtk-config --cflags)
|
||||
QT_FLAGS :=
|
||||
|
||||
%.c : %.h
|
||||
|
||||
@ -56,6 +59,11 @@ obj/gnome/%.o: %.c
|
||||
$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${GTK_CFLAGS} -DGNOME -o $@ $<
|
||||
${cleanupdeps}
|
||||
|
||||
obj/qt/%.o: %.cpp
|
||||
@if [ ! -e $(dir $@) ]; then mkdir -p $(dir $@); fi
|
||||
$(CC) -Wp,-MD,$(basename $@).d.tmp -c $(CFLAGS) ${QT_CFLAGS} -DKDE -o $@ $<
|
||||
${cleanupdeps}
|
||||
|
||||
clean:
|
||||
$(foreach dir,${CLEAN_SUBDIRS},(cd ${dir} && $(MAKE) clean);)
|
||||
rm -f *~ *.bak \#* $(TRASH)
|
||||
|
@ -48,6 +48,7 @@ default:
|
||||
@echo "motif dynamically linked motif version"
|
||||
@echo "motif-static statically linked motif version"
|
||||
@echo "gnome gnome/gtk version"
|
||||
@echo "qt kde/qt version"
|
||||
@echo " "
|
||||
|
||||
motif:
|
||||
@ -63,6 +64,10 @@ gnome:
|
||||
@cd lib; $(MAKE) gnome
|
||||
@cd src; $(MAKE) gnome
|
||||
|
||||
qt:
|
||||
@cd lib; $(MAKE) qt
|
||||
@cd src; $(MAKE) qt
|
||||
|
||||
depend:
|
||||
@cd lib; $(MAKE) depend
|
||||
@cd src; $(MAKE) depend
|
||||
@ -87,6 +92,10 @@ install: $(TARGET)
|
||||
@mkdir -p $(PREFIX)/bin
|
||||
$(INSTALL) $(TARGET) $(PREFIX)/bin/$(TARGET)
|
||||
$(INSTALL) $(TARGET).bin $(PREFIX)/bin/$(TARGET).bin
|
||||
$(INSTALL) $(TARGET).qt.bin $(PREFIX)/bin/$(TARGET).qt.bin
|
||||
$(INSTALL) $(TARGET).gtk.bin $(PREFIX)/bin/$(TARGET).gtk.bin
|
||||
@mkdir -p $(PREFIX)/toolbar
|
||||
$(INSTALL_DATA) toolbar/*.xpm $(PREFIX)/toolbar
|
||||
@mkdir -p $(PREFIX)/$(DOCDIR)
|
||||
$(INSTALL_DATA) Docs/*.html $(PREFIX)/$(DOCDIR)
|
||||
$(INSTALL_DATA) Docs/*.gif $(PREFIX)/$(DOCDIR)
|
||||
|
@ -45,6 +45,7 @@ all:
|
||||
@echo "Please choose one of the following targets:"
|
||||
@echo "motif motif version"
|
||||
@echo "gnome gnome/gtk version"
|
||||
@echo "qt kde/qt version"
|
||||
@echo " "
|
||||
|
||||
# This inclusion must come after the first target, and after the
|
||||
@ -58,7 +59,9 @@ motif:
|
||||
|
||||
gnome:
|
||||
|
||||
.PHONY: gnome motif
|
||||
qt:
|
||||
|
||||
.PHONY: gnome motif qt
|
||||
|
||||
# Local Variables:
|
||||
# tab-width: 2
|
||||
|
@ -34,7 +34,7 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH}
|
||||
######################################################################
|
||||
# See Makefile.common for information about these variables.
|
||||
COMMON_SRCS := Ledger.c SplitLedger.c
|
||||
CLEAN_SUBDIRS := engine gnome motif register
|
||||
CLEAN_SUBDIRS := engine gnome motif register qt
|
||||
######################################################################
|
||||
|
||||
all: default
|
||||
@ -55,7 +55,12 @@ gnome: ${GNOME_OBJS}
|
||||
@cd register; $(MAKE) gnome
|
||||
@cd gnome; $(MAKE) gnome
|
||||
|
||||
.PHONY: default gnome motif all
|
||||
qt: $(QT_OBJS)
|
||||
@cd engine; $(MAKE) default
|
||||
@cd register; $(MAKE) qt
|
||||
@cd qt; $(MAKE) qt
|
||||
|
||||
.PHONY: default qt gnome motif all
|
||||
|
||||
# Local Variables:
|
||||
# tab-width: 2
|
||||
|
@ -145,7 +145,7 @@ xaccSplitAsString(Split *split, const char prefix[]) {
|
||||
split_value,
|
||||
dest_name ? dest_name : "<no-account-name>",
|
||||
split_memo ? split_memo : "<no-split-memo>");
|
||||
fclose(stream);
|
||||
fclose(stream);
|
||||
return(result);
|
||||
}
|
||||
|
||||
@ -209,7 +209,7 @@ xaccTransAsString(Transaction *txn, const char prefix[]) {
|
||||
|
||||
fputs(prefix, stream);
|
||||
fprintf(stream, " %10.2f -- Transaction total\n", total);
|
||||
fclose(stream);
|
||||
fclose(stream);
|
||||
|
||||
return(result);
|
||||
}
|
||||
|
@ -42,6 +42,7 @@ COMMON_SRCS := basiccell.c cellblock.c \
|
||||
recncell.c register.c splitreg.c table-allgui.c textcell.c
|
||||
MOTIF_SRCS := table-motif.c combocell-motif.c
|
||||
GNOME_SRCS := table-gtk.c combocell-gtk.c
|
||||
QT_SRCS :=
|
||||
######################################################################
|
||||
|
||||
all:
|
||||
@ -49,6 +50,7 @@ all:
|
||||
@echo "Please choose one of the following targets:"
|
||||
@echo "motif dynamically linked motif version"
|
||||
@echo "gnome gnome/gtk version"
|
||||
@echo "qt kde/qt version"
|
||||
@echo " "
|
||||
|
||||
# This inclusion must come after the first target, and after the
|
||||
@ -59,6 +61,8 @@ motif: ${MOTIF_OBJS}
|
||||
|
||||
gnome: ${GNOME_OBJS}
|
||||
|
||||
qt: $(QT_OBJS)
|
||||
|
||||
.PHONY: all motif gnome
|
||||
|
||||
# Local Variables:
|
||||
|
Loading…
Reference in New Issue
Block a user