diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
| commit | fcdea94c3fddd42de30e6294b02fc3fa869c888e (patch) | |
| tree | 170c7320a73a56864c1f0e69324071b93420227e /libdde_linux26 | |
| parent | 19796a75ab8ba43b31e230ea169d5383c6392bfc (diff) | |
| parent | c0c35f90e218835ef0f8c0b67399ad6533763ed0 (diff) | |
Merge branch 'upstream-merged' of git.debian.org:/git/pkg-hurd/hurd into upstream-merged
Conflicts:
pfinet/ethernet.c
Diffstat (limited to 'libdde_linux26')
| -rw-r--r-- | libdde_linux26/Makeconf | 2 | ||||
| -rw-r--r-- | libdde_linux26/mk/prog.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf index 4ee54c66..00c59092 100644 --- a/libdde_linux26/Makeconf +++ b/libdde_linux26/Makeconf @@ -39,7 +39,7 @@ ifeq ($(ARCH), x86) MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default endif -PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit/include +PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES) CPPFLAGS += $(KBUILD_CPPFLAGS) diff --git a/libdde_linux26/mk/prog.mk b/libdde_linux26/mk/prog.mk index d54c38e9..c1d5d9a8 100644 --- a/libdde_linux26/mk/prog.mk +++ b/libdde_linux26/mk/prog.mk @@ -56,7 +56,6 @@ TARGET_STANDARD := $(TARGET) $(TARGET_$(OSYSTEM)) TARGET_PROFILE := $(addsuffix .pr,$(filter $(BUILD_PROFILE),$(TARGET))) TARGET += $(TARGET_$(OSYSTEM)) $(TARGET_PROFILE) -CFLAGS += $(DDEKITINCDIR) # define some variables different for lib.mk and prog.mk ifeq ($(MODE),loader) LDFLAGS += --dynamic-linker libld-l4.s.so |