janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 21:57:38 +01:00
Code Activity

$(TOPDIR), make: Merged changes of V_1_1_7_1_JL

Browse source
This commit is contained in:
Jan Lindemann 2004-04-20 16:48:50 +00:00 • committed by Jan Lindemann
commit 7067725092
6 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
make/defs.mk
View file

@ -43,7 +43,7 @@ CFILES = $(wildcard *.c)
CPPFILES = $(wildcard *.cc *.cpp)
CALLSRC = $(CFILES) $(CPPFILES)
OBJ = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALLSRC))))
SHOBJS = $(patsubst %.cpp,%.o,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
SHOBJS = $(patsubst %.cpp,lib%.so,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
SHSCRIPTS = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
SCRIPTS = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
LOCAL_HDR = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
@ -133,8 +133,8 @@ MEMBERS = $(LIB_A)($(OBJ))
#CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production
CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH)
CPPFLAGS_DEBUG = $(CFLAGS_DEBUG)
CFLAGS += $(INCLUDE) $(PROJECT_CFLAGS) $(LOCAL_CFLAGS) $(YLIB_CFLAGS)
CPPFLAGS += $(INCLUDE) $(PROJECT_CPPFLAGS) $(LOCAL_CPPFLAGS) $(YLIB_CPPFLAGS)
CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE)
CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE)
LDFFTW = -lrfftw -lfftw -lm
#LDAUDIO = -laudiofile
@ -174,8 +174,10 @@ endif
ifeq ($(GCC_MAJOR),2)
LPPFLAGS += -lg++ -lstdc++
DEPEND_CPPFLAGS += -I/usr/include/g++ -I/usr/local/include
else
LPPFLAGS += -lstdc++ -L/usr/local/lib
LPPFLAGS += -L/usr/local/gcc3.3/lib -lstdc++ -lgcc_s
DEPEND_CPPFLAGS += -I/usr/local/gcc3.3/include/c++/3.3 -I/usr/local/gcc3.3/include/c++/3.3/i686-pc-linux-gnu -I/usr/local/include
endif
ifeq ($(LIBTYPE),shared)