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

defs-orig.mk, rules.mk: Add INSTALL_LIBDIR into framework

Browse source
This commit is contained in:
Jan Lindemann 2002-05-05 11:17:17 +00:00 • committed by Jan Lindemann
commit 95ecc89ead
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
make/defs-orig.mk
View file

@ -83,7 +83,7 @@ ALL_CSRC = $(LOCAL_CSRC) $(PREREQ_CSRC)
TEXTCLEAN = $(wildcard *~ .*~ .*.swp *.rep) TEXTCLEAN = $(wildcard *~ .*~ .*.swp *.rep)
INCLUDE = -I. -I$(TOPDIR)/include -I$(MODDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE) INCLUDE = -I. -I$(TOPDIR)/include -I$(MODDIR)/include $(PROJECT_INCLUDE) $(LOCAL_INCLUDE)
LIBDIR = $(MODDIR)/lib INSTALL_LIBDIR = $(PREFIX)/lib
LIB = $(LIBDIR)/lib$(LIBNAME).a LIB = $(LIBDIR)/lib$(LIBNAME).a
MEMBERS = $(LIB)($(OBJ)) MEMBERS = $(LIB)($(OBJ))
#PREFIX = ../# CAUTION: This breaks the installation in the project #PREFIX = ../# CAUTION: This breaks the installation in the project
@ -102,7 +102,8 @@ CFLAGS += $(CFLAGS_DEBUG)
CPPFLAGS += $(CFLAGS_DEBUG) CPPFLAGS += $(CFLAGS_DEBUG)
endif endif
INSTALLED_SHOBJS = $(addprefix $(PREFIX)/lib/,$(SHOBJS)) LIBDIR = $(MODDIR)/lib
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
ifeq ($(USE_QT),true) ifeq ($(USE_QT),true)
USE_X = true USE_X = true

4
make/rules.mk
View file

@ -27,7 +27,7 @@ $(LIBDIR):
moc_%.cpp: %.h moc_%.cpp: %.h
$(MOC) -o $@ $< $(MOC) -o $@ $<
lib%.so: %.o lib%.so: %.o # $(LIB)
$(CC) $< $(LDFLAGS) -o $@ $(CC) $< $(LDFLAGS) -o $@
$(TOPDIR)/include: $(TOPDIR)/include:
@ -55,7 +55,7 @@ endif
$(LIBS): $(LIBS):
make -C $(LIBDIR) all make -C $(LIBDIR) all
$(PREFIX)/lib/%.so: %.so $(INSTALL_LIBDIR)/%.so: %.so
$(INSTALL) $< $@ $(INSTALL) $< $@
$(PREFIX)/bin/$(EXE): $(EXE) $(PREFIX)/bin/$(EXE): $(EXE)