From f431dc624a04b9280ddd5a6a839adc25ad621847 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 16 May 2013 23:12:37 +0200 Subject: * buildlib/apti18n.h.in: - fix build failure when building without NLS (closes: #671587) --- buildlib/apti18n.h.in | 1 + 1 file changed, 1 insertion(+) (limited to 'buildlib') diff --git a/buildlib/apti18n.h.in b/buildlib/apti18n.h.in index 6928d626c..a9d48dd97 100644 --- a/buildlib/apti18n.h.in +++ b/buildlib/apti18n.h.in @@ -25,4 +25,5 @@ # define _(x) x # define P_(msg,plural,n) (n == 1 ? msg : plural) # define N_(x) x +# define dgettext(d, m) m #endif -- cgit v1.2.3 From ac62eb38b0bca7a45835903eb421c19f4f78aca3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 19 May 2013 15:49:24 +0200 Subject: build the en manpages in subdirectory doc/en Building manpages becames more consistent this way and it is simpler to ignore build artefacts, too. --- buildlib/po4a_manpage.mak | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'buildlib') diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 09eca0ec2..1e778cf11 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -25,6 +25,7 @@ $(LOCAL)-LIST := $(SOURCE) # Install generation hooks manpages: $($(LOCAL)-LIST) +clean: clean/$(LOCAL) veryclean: veryclean/$(LOCAL) apt-verbatim.ent: ../apt-verbatim.ent @@ -37,15 +38,16 @@ manpage-style.xsl: ../manpage-style.xsl $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES) echo Creating man page $@ $(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here??? - test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed + test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed' mv -f $(subst .$(LC),,$@) $@ # Clean rule -.PHONY: veryclean/$(LOCAL) +.PHONY: clean/$(LOCAL) veryclean/$(LOCAL) +clean/$(LOCAL): + rm -f $($(@F)-LIST) apt.ent apt-verbatim.ent veryclean/$(LOCAL): - -rm -rf $($(@F)-LIST) apt.ent apt-verbatim.ent apt.$(LC).8 \ - $(addsuffix .xml,$($(@F)-LIST)) \ - offline.$(LC).sgml guide.$(LC).sgml + # we are nuking the directory we are working in as it is auto-generated + rm -rf $(shell readlink -f .) HAVE_PO4A=yes endif -- cgit v1.2.3 From 564fcbf93c78deb48fa44a9a63b5602eedfa53a9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Tue, 28 May 2013 18:48:28 +0200 Subject: depend on libapt-pkg in the libapt-inst build process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixing parallel build in the handcrafted buildsystem is a pain, so its not enabled by default, but its works for me – sometimes Git-Dch: Ignore --- buildlib/library.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildlib') diff --git a/buildlib/library.mak b/buildlib/library.mak index 029e87463..ef1306b66 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -51,7 +51,7 @@ $(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR) ln -sf $( /dev/null echo Building shared library $@ $(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\ @@ -61,7 +61,7 @@ $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) # Compilation rules vpath %.cc $(SUBDIRS) -$(OBJ)/%.opic: %.cc +$(OBJ)/%.opic: %.cc $(LIBRARYDEPENDS) echo Compiling $< to $@ $(CXX) -c $(INLINEDEPFLAG) $(CPPFLAGS) $(CXXFLAGS) $(PICFLAGS) -o $@ $< $(DoDep) -- cgit v1.2.3 From 57da1b4bd21aceced30f658993fb811a5232cff7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 31 May 2013 18:19:09 +0200 Subject: stop building l10n if strings are unchanged The buildsystem tried to build l10n for test applications which never produced the output it expected causing it to try building it all the time. --- buildlib/copy.mak | 2 +- buildlib/podomain.mak | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'buildlib') diff --git a/buildlib/copy.mak b/buildlib/copy.mak index e8fe43deb..3ae11a7eb 100644 --- a/buildlib/copy.mak +++ b/buildlib/copy.mak @@ -21,7 +21,7 @@ veryclean: veryclean/$(LOCAL) MKDIRS += $(dir $($(LOCAL)-LIST)) -$($(LOCAL)-LIST) : $(TO)/% : % dirs +$($(LOCAL)-LIST) : $(TO)/% : % echo Installing $< to $(@D) cp $< $(@D) diff --git a/buildlib/podomain.mak b/buildlib/podomain.mak index cca7d55be..265359abc 100644 --- a/buildlib/podomain.mak +++ b/buildlib/podomain.mak @@ -4,6 +4,8 @@ # declared domain of the make file. It also arranges to set the DOMAIN # CPPFLAG for the compilation. +ifneq ($(APT_DOMAIN),none) + MY_DOMAIN := $(PACKAGE) ifdef APT_DOMAIN $($(LOCAL)-OBJS): CPPFLAGS := $(CPPFLAGS) -DAPT_DOMAIN='"$(APT_DOMAIN)"' @@ -13,10 +15,13 @@ endif MKDIRS += $(PO_DOMAINS)/$(MY_DOMAIN) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: SRC := $(addprefix $(SUBDIR)/,$(SOURCE)) $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list: makefile dirs - (echo $(SRC) | xargs -n1 echo) > $@ + (echo $(SRC) | xargs -n1 echo) > $@.tmp + cmp --silent $@.tmp $@ || mv $@.tmp $@ startup binary program clean update-po: $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean: veryclean/$(LOCAL) veryclean/po/$(LOCAL): LIST := $(PO_DOMAINS)/$(MY_DOMAIN)/$(LOCAL).$(TYPE)list veryclean/po/$(LOCAL): rm -f $(LIST) + +endif -- cgit v1.2.3