Sync

[apt.git] / buildlib / defaults.mak

diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak
index 05a4392a50574b5388c9706d89134a70cd745733..c9a501e8458c42835250f45eee74a2542512decf 100644 (file)
--- a/buildlib/defaults.mak
+++ b/buildlib/defaults.mak
@@ -47,7 +47,7 @@ endif
 INCLUDE := $(BUILD)/include
 BIN := $(BUILD)/bin
 LIB := $(BIN)
-OBJ := $(BUILD)/obj
+OBJ := $(BUILD)/obj/$(SUBDIR)
 DEP := $(OBJ)
 DOC := $(BUILD)/doc
 
@@ -55,6 +55,7 @@ DOC := $(BUILD)/doc
 LIBRARY_H = $(BASE)/buildlib/library.mak
 DEBIANDOC_H = $(BASE)/buildlib/debiandoc.mak
 MANPAGE_H = $(BASE)/buildlib/manpage.mak
+PROGRAM_H = $(BASE)/buildlib/program.mak
 
 # Source location control
 # SUBDIRS specifies sub components of the module that
@@ -70,14 +71,15 @@ HEADER_TARGETDIRS+=
 
 # Options
 include $(BUILD)/environment.mak
-CPPFLAGS+= -I$(BUILD)/include
+CPPFLAGS+= -I$(INCLUDE)
+LDFLAGS+= -L$(LIB)
 
 # Phony rules. Other things hook these by appending to the dependency
 # list
 .PHONY: headers library clean veryclean all binary program doc
 all: binary doc
 binary: library program
-maintainer-clean dist-clean: veryclean
+maintainer-clean dist-clean distclean pristine sanity: veryclean
 headers library clean veryclean program:
 
 # Header file control. We want all published interface headers to go
@@ -93,7 +95,7 @@ $(INCLUDE)/%.h $(addprefix $(INCLUDE)/,$(addsuffix /%.h,$(HEADER_TARGETDIRS))) :
 # makedep program that can be called after compiling, that's illistrated
 # by the DEPFLAG case.
 # Compile rules are expected to call this macro after calling the compiler
- ifdef INLINEDEPFLAG
+ifdef INLINEDEPFLAG
  define DoDep
        sed -e "1s/.*:/$(subst /,\\/,$@):/" $(basename $(@F)).d > $(DEP)/$(basename $(@F)).d
        -rm -f $(basename $(@F)).d