diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:28:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:28:56 +0200 |
| commit | c6db537edac054a03847b1b99f78c00703f48d6b (patch) | |
| tree | b68068a7f8b5ae8b346a4f8855459e73ed4a0d01 /libdde_linux26/mk | |
| parent | 8df772b3c665e663f6f9d2a70f9c691590bd3f91 (diff) | |
| parent | a6a2e4c910172d8309d38b914459d9b41509c411 (diff) | |
Merge branch 'dde' of git.debian.org:/git/pkg-hurd/hurd into dde
Conflicts:
pfinet/ethernet.c
Diffstat (limited to 'libdde_linux26/mk')
| -rw-r--r-- | libdde_linux26/mk/prog.mk | 1 |
1 files changed, 0 insertions, 1 deletions
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 |