janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-23 14:30:39 +01:00
Code Activity

defs.mk: Now not using gfilt for rpm based builds (still ugly, might be better to use configure

Browse source
This commit is contained in:
Jan Lindemann 2006-03-17 16:50:28 +00:00 • committed by Jan Lindemann
commit 587c7caff8
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/defs.mk
View file

@ -45,8 +45,6 @@ YTOOLS_VERSION_STR = \"@PACKAGE_VERSION@\"
# TOPDIR := $(MODDIR) # TOPDIR := $(MODDIR)
#endif #endif
CPP = g++
EXE_SH += $(wildcard *.sh *.pl) EXE_SH += $(wildcard *.sh *.pl)
MKFILES += $(wildcard *.mk) MKFILES += $(wildcard *.mk)
@ -305,11 +303,8 @@ endif
LDFLAGS += -L$(LIBDIR) $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) LDFLAGS += -L$(LIBDIR) $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS)
LDREST += $(LDAUDIO) $(LDFFTW) -ldl LDREST += $(LDAUDIO) $(LDFFTW) -ldl
CC = $(YAMD)gcc CC = $(YAMD)gcc
#CPP = $(YAMD)g++ CPP = sh $(firstword $(wildcard $(MODDIR)/contrib/gfilt/gfilt $(MODDIR)/bin/gfilt))
#CPP = gfilt ifeq ($(strip $(CPP)),sh)
ifeq ($(USE_RPMLIBS),)
CPP = sh $(MODDIR)/contrib/gfilt/gfilt
else
CPP = g++ CPP = g++
endif endif
RM = rm RM = rm